More auto-ness for making Linux (Ubuntu is what I'm testing now) happy