[cvz] Multiple changes