Minor validation improvements.