Fixes for ES5 strict mode