Improved auto targeting resolving some issues.