Fixes for the Chrome version redirecting things too often