Fix deprecated metadata update + safety option