bb11160 - Plug a few memory leaks