* [DEP] Minor improvements to startup.