Fix up some distribution things