misc fixes for v2