Fix more d2i cases to properly update the input pointer