Fix startup ordering problem