Fix Relationship Issues