some GV fixes