applying fixes for firefox