Improvements to how filemanager handles installs in sub-directory