Fix mcmmo refactors