diff --git a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
index 0bbb56897a1..2cbab96686b 100644
--- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
@@ -19,10 +19,10 @@ Export-Package: org.eclipse.dstore.core,
  org.eclipse.dstore.core.server,
  org.eclipse.dstore.core.util,
  org.eclipse.dstore.core.util.ssl,
- org.eclipse.dstore.internal.core.client;x-internal:=true,
- org.eclipse.dstore.internal.core.model;x-internal:=true,
+ org.eclipse.dstore.internal.core.client;x-friends:="org.eclipse.rse.connectorservice.dstore, org.eclipse.rse.services.dstore",
+ org.eclipse.dstore.internal.core.model;x-friends:="org.eclipse.rse.connectorservice.dstore, org.eclipse.rse.services.dstore",
  org.eclipse.dstore.internal.core.server;x-internal:=true,
- org.eclipse.dstore.internal.core.util;x-internal:=true,
+ org.eclipse.dstore.internal.core.util;x-friends:="org.eclipse.rse.connectorservice.dstore, org.eclipse.rse.services.dstore",
  org.eclipse.dstore.internal.core.util.ssl;x-internal:=true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath
index 089217cde9e..b7464f3ca24 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/dstore/**"/>
-		</accessrules>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
index e2065726a9f..0947c08ba53 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services.dstore;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.dstore.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dstore.core;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.dstore.extra;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/.classpath b/rse/plugins/org.eclipse.rse.services.dstore/.classpath
index 21eef6af21a..5c9d5dee911 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/.classpath
+++ b/rse/plugins/org.eclipse.rse.services.dstore/.classpath
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/dstore/**"/>
-			<accessrule kind="discouraged" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="src" path="miners"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
index a0b8372368f..32c8b73aef3 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.rse.internal.services.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.dstore.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.dstore.core;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.dstore.extra;bundle-version="[2.1.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java
index 9c362ddf3ae..7cfeb0585c4 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java
@@ -59,6 +59,7 @@ import org.eclipse.dstore.core.model.DataStoreAttributes;
 import org.eclipse.dstore.internal.core.model.IDataStoreSystemProperties;
 import org.eclipse.rse.dstore.universal.miners.CommandMiner;
 import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
+import org.eclipse.rse.dstore.universal.miners.UniversalServerUtilities;
 import org.eclipse.rse.internal.dstore.universal.miners.command.patterns.ParsedOutput;
 import org.eclipse.rse.internal.dstore.universal.miners.command.patterns.Patterns;
 
@@ -674,13 +675,18 @@ public class CommandMinerThread extends MinerThread
 			
 			
 			String origInput = input;
+			UniversalServerUtilities.logInfo(getName(), "shell input prior to char conversion="+input, _dataStore); //$NON-NLS-1$
+
 			if (_supportsCharConversion){
 				input = convertSpecialCharacters(input);
 			}
 			input.getBytes();
+			UniversalServerUtilities.logInfo(getName(), "shell input after char conversion="+input, _dataStore); //$NON-NLS-1$
+			
 			if (_isCsh && origInput.startsWith("export ")){ //$NON-NLS-1$
 				input = origInput.replaceAll("export ", "set ");  //$NON-NLS-1$//$NON-NLS-2$
-			}
+			}			
+			
 			try
 			{
 				BufferedWriter writer = _stdOutput;