More 64-bit architecture fixes.