More bug fixes for GVN