Extension fixes