Improvements in the bootsrap script