mapff fixes