Fixed compilation on Windows (part 2)