Add back some required locking