More Windows cleanups and fixes...