More fixes with cffi