Fix issues in strict mode