Fix for ItemUpgrade and for correctly dropping the items from my machines during block break.