Some minor fixups on constraint errors