More s/us fixes