Another 32->64 change