More strict mode fixes