go vet fixes for 1.2
1.2 only