Fix child issues