fixed some issues clashing extension imports