Fix more deprecated helpers