More deprecation fixes.