Fix issues identified by go vet