Fix LockScreen and minimal changes