Fix a few things
Merge CM