Fixes to related objects and labels