Fix deprecated items