More fixes for firefox