Remove some XDG env variable checks, couple other fixes