Validation format fixes