minor fixes as per PR