Fixed deprecation notices