More E_NOTICE fixes