Couple of fixes for MM 1.4.19