fixes as requested by M on 11 March