Fix FF bugs