fixes as per review comments on #701