Properly set Distribution.targets and .comm