Comment fixes.
Avoid defer in the lock too