Fix up fat-client code