Additional deprecation fixes