Fixes base class inheritance errors