r6623: This change fixes a few broken commands plus adds some