Fix windows compilation problems caused by previous commit.