11 minor fixes