GH: Fixes to the mage.