More improvements to gvr code.