64 bit fixes.