- Improved restore current directory behavior.