TargetInfo: Fix and adjustment to new API