Fix two compilation errors when running go build ./...

Fixes compilation errors when you run go build ./... at HEAD. HEAD should not be able to break like this, because it makes large refactorings hard to do (since you can't just compile everything to see that things are working). Also tools like go get ./... hit spurious errors and not complete. Fixing #1581 would prevent this from happening.