3 minor fixes