Minor fixes for firefox