more mpm fixes (i hope)