Continue fixing ports that were incorrectly ported from MC.