Unreviewed, build fix for Windows