A few tweaks to get rid of the rest of my env