more extension fixes