Fix some errors

Placeholder Andriy Kushnirrequested to merge
openpgp/fixes into master

Merge request reports