Yet more deprecation fixes