Some UID fixes