Minor extension fixes