validation fixups