fixes: assorted issues spotted by go vet