Minor FF changes