Build fix for 32-bit Linux and tweaks to address derivation algorithm.
More tweaks to address derivation, going to test on other boxen.