Fix some of the relationship issues