[dist] Moar changes