Sam: Fix validation problems.