Fixed an issue where items with uses weren't being consumed

Fixed #970
Fixed #964