More urgent deprecation fixes