Strict mode fixes