USI abstract fixes