make build on macOS was failing due to some minor go build issues, these two commits tries to fix those
make build