Revert two warn fixes because of C++ destructors