More 32bit changes