Fix distribution management