More updates to validation.