Update reloading to be more robust.