Fix TargetofTarget and FocusTarget