Update python and C code to make play well with changed data types