Further updates to basic validation.