Part fix of the source path retargeting issue.