fixes a few shadowing/unused/v.dtor. warnings