diff --git a/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF
index 32b95386dea..5ed489c4239 100644
--- a/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF
@@ -21,6 +21,7 @@ Require-Bundle: org.eclipse.core.resources,
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.useractions.ui.compile,
+ org.eclipse.rse.useractions.ui.uda,
  org.eclipse.rse.useractions.files.compile,
  org.eclipse.rse.useractions.files.uda,
  org.eclipse.rse.internal.useractions.ui.compile,
diff --git a/rse/plugins/org.eclipse.rse.useractions/plugin.properties b/rse/plugins/org.eclipse.rse.useractions/plugin.properties
index b377d10ea52..7990f1fce06 100644
--- a/rse/plugins/org.eclipse.rse.useractions/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.useractions/plugin.properties
@@ -20,6 +20,3 @@ providerName = Eclipse.org
 PropertyPage.TeamViewUserActionNode = User Action Information
 PropertyPage.TeamViewCompileTypeNode = Compile Type Information
 PropertyPage.TeamViewCompileCommandNode = Compile Command Information
-
-DynamicLabel.CompileActionNode = Compile
-DynamicLabel.UserActionNode = User Action
diff --git a/rse/plugins/org.eclipse.rse.useractions/plugin.xml b/rse/plugins/org.eclipse.rse.useractions/plugin.xml
index 48c4a9364c5..658df2cc943 100644
--- a/rse/plugins/org.eclipse.rse.useractions/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.useractions/plugin.xml
@@ -39,31 +39,5 @@
       </page>
    </extension>
    
-   <extension point="org.eclipse.ui.menus">
-     <menuContribution locationURI="popup:org.eclipse.rse.ui.view.systemView">
-        <menu id="org.eclipse.rse.ui.useractions.compile.menu"
-              label="%DynamicLabel.CompileActionNode"
-              mnemonic="useractions.dynamiccompilemenu.mnemonic">
-           <dynamic class="org.eclipse.rse.internal.useractions.ui.SystemDynamicCompileMenu"
-                    id="org.eclipse.ui.rse.ui.views.dynamiccompilemenu">
-           </dynamic>
-           <!--
-           <visibleWhen>
-             <instanceof
-                  value="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>
-           </visibleWhen>
-           -->
-        </menu>
-        
-        <menu id="org.eclipse.rse.ui.useractions.useraction.menu"
-              label="%DynamicLabel.UserActionNode"
-              mnemonic="useractions.dynamicuseractionmenu.mnemonic">
-           <dynamic class="org.eclipse.rse.internal.useractions.ui.SystemDynamicUserActionMenu"
-                    id="org.eclipse.ui.rse.ui.views.dynamicuseractionmenu">
-           </dynamic>
-        </menu>
-       
-     </menuContribution>
-     </extension>
 	
 </plugin>
diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemDynamicCompileMenu.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/compile/SystemDynamicCompileMenu.java
similarity index 95%
rename from rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemDynamicCompileMenu.java
rename to rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/compile/SystemDynamicCompileMenu.java
index 2a61f40c974..a198d3bd138 100644
--- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemDynamicCompileMenu.java
+++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/compile/SystemDynamicCompileMenu.java
@@ -1,4 +1,4 @@
-package org.eclipse.rse.internal.useractions.ui;
+package org.eclipse.rse.useractions.ui.compile;
 
 import java.util.ArrayList;
 
@@ -16,12 +16,11 @@ import org.eclipse.rse.internal.useractions.ui.compile.SystemCompileCommand;
 import org.eclipse.rse.internal.useractions.ui.compile.SystemCompileManager;
 import org.eclipse.rse.internal.useractions.ui.compile.SystemCompileProfile;
 import org.eclipse.rse.internal.useractions.ui.compile.SystemCompileType;
+import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
 import org.eclipse.rse.ui.view.SystemAdapterHelpers;
 import org.eclipse.rse.useractions.files.compile.ISystemCompileManagerAdapter;
-import org.eclipse.rse.useractions.ui.compile.SystemCompileAction;
-import org.eclipse.rse.useractions.ui.compile.SystemWorkWithCompileCommandsAction;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -54,7 +53,10 @@ public class SystemDynamicCompileMenu extends CompoundContributionItem
 		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		ISelection selection = window.getSelectionService().getSelection();
 		Object firstSelection = ((IStructuredSelection) selection).getFirstElement();
-		
+		if (firstSelection == null || (!(firstSelection instanceof IRemoteFile)))
+		{
+			return new IContributionItem[0];
+		}
 		Shell shell = SystemBasePlugin.getActiveWorkbenchShell();
 		
 		for (int idx = 0; idx < activeProfiles.length; idx++)
diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemDynamicUserActionMenu.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemDynamicUserActionMenu.java
similarity index 94%
rename from rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemDynamicUserActionMenu.java
rename to rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemDynamicUserActionMenu.java
index 0f1b659211d..85ac9271e01 100644
--- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemDynamicUserActionMenu.java
+++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/useractions/ui/uda/SystemDynamicUserActionMenu.java
@@ -1,4 +1,4 @@
-package org.eclipse.rse.internal.useractions.ui;
+package org.eclipse.rse.useractions.ui.uda;
 
 import java.util.ArrayList;
 
@@ -15,6 +15,7 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.internal.useractions.ui.uda.SystemUDAResources;
 import org.eclipse.rse.internal.useractions.ui.uda.SystemUDActionSubsystem;
 import org.eclipse.rse.internal.useractions.ui.uda.actions.SystemWorkWithUDAsAction;
+import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
 import org.eclipse.rse.ui.view.SystemAdapterHelpers;
@@ -51,6 +52,10 @@ public class SystemDynamicUserActionMenu extends CompoundContributionItem
 		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		ISelection selection = window.getSelectionService().getSelection();
 		Object firstSelection = ((IStructuredSelection) selection).getFirstElement();
+		if (firstSelection == null || (!(firstSelection instanceof IRemoteFile)))
+		{
+			return new IContributionItem[0];
+		}
 		ISystemRemoteElementAdapter rmtAdapter = SystemAdapterHelpers.getRemoteAdapter(firstSelection);
 		
 		 ISubSystem subsystem = rmtAdapter.getSubSystem(firstSelection);