fix FF issues