Fix more casts