Changes to support Windows.