a few more tweaks fixing aggregation when it has only one child