Fix declarations of data types