Fixed startup configuration handling