Fixes for MSVC error C2797.