More fixes to make native Windows builds work.