Fix for OSCommandingShell #2181
RFIShell #2181
Fix XPathReader #2181