Further fixes to bootstrap folder-finding code