Improved bootstrap scripts