Fixes on 3rd party extensions migration