Combine current Windows fixes for testing purposes.