Build fixes and start of client code