Use externals, bugfix