Startup improvements