Minor tweaks

I tested everything on Windows as good as I could since things don't work right here.

/CC @jmervine 

I can try split this if needed.