Fixes for MMS in Flame

My fault. I don't think so, just be careful and don't push it.