Minor tweaks for mfg