Adapt integration targets

Self-merge.