ClientBuilderfix, and client.close() cleanup