Re: Fix various nits on Windows