Fix deprecation messages