Build with -Wnon-virtual-dtor.  Add a couple more forgotten virtual dtors