Minor changes before we freeze the go2.2 version of gub