Fix dropping, convert old torches