Fixes for implementation of children