fixes for new client lib