Improvements to performance for creating targets.