Corrected some cms-style bugs