Make child part finding during update more robust
Fix race condition in updates