fixup! improve bootstrap scripts