Fix protocol data types