Trying to robustify the handling of paths during update