Cross browser and RSPEC fixes