Import fixes for externals