Various changes, mainly on data types