Bug fixes and child diff