Misc cleanup after v1 / v2 merge