Minor fixes for W32