More class extension fixes