Fix win incompatibilities new and old.