Small fixes as per Conor's comments