mom-74, mom-75, mom-76 fixes

Fixes for three MOM issues (diagnostics support)
Code changes by Stephen Griffies.