Fixed variable size and endianness issues