Improve startup scripts