Fixes for MSVC shortcomings.