Migrate to 64bit intgeres