Some improvements to the auto lock system.