Fixing some distributor stuff