MM fixes