TEIIDDES-2132 fixed minor enablement/error issues