More deprecation fixes