[[ Bug 13465 ]] Fix a few further memory leaks related to containers