Fixes for Chrome