fixes for M* and UM* from Aleksej