Fix deprecated imports