Partially fixed OSX bootstrapper