minor fixes for v2