Craft/Armor Fixes