fix up the int64 handling a little. It should work on a few more