Fix regression on deprecated functions