Missed bits after distr cleanup