fix 32-bit compile bugs
Merge branch 'master' of https://github.com/HeliumProject/Helium