Fixed some validation.