Changes to improve validation.