Fixing strict mode errors