small fixes and use NoShippingRequired method instead of None