More windows build fixes.