Fix data types (including distribution's type)