Fixes as per PR comments