Memory leak fixes (pt.4)

Patrick Steinhardtrequested to merge
pks-leak-fixes-pt4 into master

This is the fourth part of memory leak fixes.

Merge request reports