[cvz] Removed a bunch of warnings