Some fixes to v2