Complete various itemID fixes for 1.7