app_lock improvements