validation fixes

Thanks to @nickanderson for catching these!