Fixes 'mfg' console command and adds some more fixes.