Fix up client libraries