Fix deprecated refs