Fixing more misplaced //#IFs