Win32 clean-ups
Win32 related clean ups