Tweaks to fix mms build