Some fixes for the Item Handling System