GV: minor fixes