Bug fixes around parent / child_components (new name "Definitions")