Fix conduit datatypes to get it fixed in newer versions
Fix compilation due to dependency API changes
Merge branch 'arpunk-fix-conduit-datatypes'

* arpunk-fix-conduit-datatypes:
  Fix compilation due to dependency API changes
  Fix conduit datatypes to get it fixed in newer versions