Minor tweaks for v2.