Improved manual lock handling