Fix compilation after changes in rust master
Fix warnings
ver++