Fix FF issues