Small improvements for the child node validation