Some small deprecation fixes