PR/341: Jan Kaluza: Fix memory leak
New fixes