Fix common base class support