Fix validation errors. Skip PID validation for now