Improve base install scripts