Fixes for libv2 changes

Closes #320 
Closes #322