Validation fixups