Fix bootstrap issues when building without threads
2 files changed