Changes for MPL v2
More cleanups for mpl_v2