Minor validation updates

Updated a few changed items and a few items which I'd misinterpreted.