Fixes for issue #924
Merge pull request #925 from jpapon/typename_fix_VS

Fixes for issue #924