Fix various assumptions about mpw sizes.