Enable bootstrap, fix shell