Fixes to client setup and build tags
2 files changed