Startup fixes and enhancements