Minor updates from working on Windows for a while.