Fix some bootstrapping issues
Work from directories other than packaging
Fix some bootstrapping issues
Fix some bootstrapping issues