5.4 strict mode fixes