Fixed startup errors