UID fixes