Fix more firefox compatibility