Cleanup: Fix for boneheaded fixes