More bootstrap cleanup and fixes #38