macp misc changes.