Fixes to get travis builds working as they now support 64-bit.