Proper modes last minute fixes

Sorry, I found a comment from you about a thing you wanted me to fix, but I hadn't. I literally pushed these tiny commits one minute after you merged ;).