class extension fixes