Initially tested fixing fd violations