merging cm fixes