Fixed data types for 64-bit. Fixes #1