Fixed Incompatabilities with Minigrace#2

IsaacOscar wants to merge 2 commits intomwh:mastermwh/kernan:masterfrom

IsaacOscar:minigrace-compatabilityIsaacOscar/kernan:minigrace-compatabilityCopy head branch name to clipboard