Next round of updates on input validation.