More validation fixing.