Strict mode fixes.