MACP misc changes.