Fixes for MMS in Flame

Thanks for doing this :)