CollectableItem and Flashlight updates to correctly extend stuff