Unreviewed, attempt to fix Windows Debug build part 2