Cleanup destructor issues described in #183