UNIQUE now properly enforced where appropriate