More Item compatibility changes to Tool Belt