Some housekeeping of externals