uid only fixes