Improvements/fixes to child routers.