Fix updating with not yet saved units