mp fixes