Feature/externals v5

Some minor fixes