Tweak things a bit based on my school desktop install