[geometry] Fixes for new MSVC issues