Minor fixes as per Colin's suggestions