Minor commits to do with bootstrapping