Fixed mpl to incorporate changes landed with PR#427.

This PR fixes mpl and make it compatible with current master after the land of the big properties PR.