MPL: Bug fix and some cleanup