Minor fixes
Fixed bootstrap script