#3 minor fixes