Fix errors compared to upstream
VerificationReport prints correctly for long lines
Grammar in comments