More fixes to keepOff