Fixed up some environment variables
Auto-lock screen after auto-login