Fixes for firefox