More validation work.