Fixes as per review