Merge "Fix some spots where targetUid was missed"