more MIMA fixes