Fix some smaller errors reported by go lint / go vet