Small fixes for firefox