Fix new coverity issues (incorrect deallocator used)