Some corrections to the validation procs