Fix more D2 issues