Fixed deprecation messages