more mprun fixes