MSVC fixes after UNUSED_PARAM() additions