General Fix up from cm