Fixes minor deprecation warnings [applied]