Fixing broken relationships and cascade behaviours (yay)