Improve startup behavior