Related data constraint fixes