Attempt to fix Windows bugs.