Relation and ID fixes