Complete Mage load error fixes