Few fixes.

Stil having issues with enchanted items.