Fix slow exits