Fix two compilation errors when running go build ./...
Merge pull request #2213 from ghodss/fix_build_errors

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