Feature/externals v5

A couple of fixes