+2 minor fixes