Fix up warnings (from go vet)