Fix few of the go vet complains