Fix validating contacts. Small fixes.