More MPP bug fixes.