Fixes for MMS in Flame