Various E_STRICT error fixes