Fixed various issues with bootstrapping on ST2/Windows