[hooks] Fix deprecation fixes [applied]