Fixed startup issues