fixes as in Eoin's email