Fixed deprecation annotations