Merge "Fix destructors"