Make bootstrap script a little more robust (I hope)