Fix more minor mistakes for validation.