Add a missing locking, don't open too many extra slots