Lockmenu fixes