MCH Fixes

Minor fixes to various MCH source files. Details in specific commits.