Fixes for Firefox
More FF fixes