Enabled build against r12227-r12232 changes in MM
Various small edits/cleanups