Various updates potentially related to sub-folder installs