Some small fixes for Firefox