Related entries fixes