fix FF bugs