Misc fixes for Chrome