MM Update

Minor fixes etc