Fix base classes