fixup v2 rules a bit