Fix more 64bits