This is a small number of fixes to ensure compilation under a 64-bit architecture, which many of you may have by now. Thanks for the testbed, I'm sure it will be well used as we go forward!