made develop branch 64-bit safe

A few changes to allow compiling the develop branch on 64-bit linux systems.