Some Windows-related changes