misc cm changes