Cross browser issue fixes