Client Build problems sorted out