Fixed FF issues