Fixes as per Chris review