Fixing memory leaks (Christian)

No match.