fixes for mass-virtual