Go vet fixes

Fix two errors. Run `go vet` in tests to prevent more.