Fixes current go vet warnings