Improvements for the lock problem