Fixed up from base class changes