Fixes for MMS in Flame

Will try!