TRACK: More 64bit compatibility fixes.