changes required by UUID-related changes to the internal client API