Fix slow startup