david-cortes corrections for msvc