Registry: Repair mismatched ItemBlocks as well
Fix a few misc issues