615 minor fixes