Fix some issues identified by go vet

There are a few more but these are the trivial ones.  Run `go tool vet -all .` to see the remaining ones.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>