Fix bugs identified during product export

Warranty isn't required universally, but it is required for certain classes of items so I'm putting it back.