Fixes as per PR