More post merge cleanups, make it compile under Windows.