last fixes from MMMF