Fixing typo
Implementing some refinements for virtuoso adapter