Fix more crashes on DEX