Fix quirks with new client structure