fixes to filled_device_hierarchy