Validation fixups.