Make checkout compatible with Hub