Fixes for Chrome pre-36