light-children: Fix issues - WIP