Tweaks and MM Changes