Fix deprecated changes