RID fixes