Minor fixes for previous input validation commit.