fixes as per PR