Some fixes iterating through children and other