Fixed Bugs that manifest themselves in Firefox