Store path in persistent storage, and a few tweaks