Fixes 64 bit issues