fixes as requested by M