Minor edits to some base classes