more E_STRICT error fixes