Fix/fix some memory leaks

Merged François Grisez requested to merge fix/fix_some_memory_leaks into master

Merge request reports