tweaks for uss (again)