Distribution#data fixes