Bug fixes for Chrome and IE 10+