Minimal fixes to save the bootstrap on OSX.
2 files changed