A few fixes for firefox