Fix a few things caught by go vet

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>