fix up baseclass a bit