Add target info in many more places.