Fixup some validation failz (mostly from bad tabbery)