#275 minor fixes