-Fixing FF issues