#2 minor fixes