Fix i686 breakage
Migrate to cargo (p056-p060)