fixing the externals issues