MSVC fixes, fixed value parsing