Few fixes for Firefox