Deprecation fixes

@prachigauriar @jnjosh @Dfowj Please review