Fixed startup logic a bit.