Small fixups to validation