BAM - update some classes to have virtual destructors