Minor changes of data type