diff --git a/rosjava/src/main/java/org/ros/internal/node/DefaultNode.java b/rosjava/src/main/java/org/ros/internal/node/DefaultNode.java
index a1572cb3f64e045606fc9af935b908d2fe412fc9..e5a4b7c098ee622edbe6331862b1b1df0526f9da 100644
--- a/rosjava/src/main/java/org/ros/internal/node/DefaultNode.java
+++ b/rosjava/src/main/java/org/ros/internal/node/DefaultNode.java
@@ -39,8 +39,6 @@ import org.ros.internal.node.service.ServiceDeclaration;
 import org.ros.internal.node.service.ServiceFactory;
 import org.ros.internal.node.service.ServiceIdentifier;
 import org.ros.internal.node.service.ServiceManager;
-import org.ros.internal.node.topic.DefaultPublisher;
-import org.ros.internal.node.topic.DefaultSubscriber;
 import org.ros.internal.node.topic.PublisherFactory;
 import org.ros.internal.node.topic.SubscriberFactory;
 import org.ros.internal.node.topic.TopicDeclaration;
@@ -405,6 +403,7 @@ public class DefaultNode implements ConnectedNode {
     // NOTE(damonkohler): We don't want to raise potentially spurious
     // exceptions during shutdown that would interrupt the process. This is
     // simply best effort cleanup.
+    slaveServer.shutdown();
     topicParticipantManager.shutdown();
     for (ServiceServer<?, ?> serviceServer : serviceManager.getServers()) {
       try {
diff --git a/rosjava_helpers/src/main/java/org/ros/helpers/ParameterLoaderNode.java b/rosjava_helpers/src/main/java/org/ros/helpers/ParameterLoaderNode.java
index 47aa44069c47f9677a858a887254447f3f7503f8..25fcdd647e4573ddb8936f08975a80c5e296329c 100644
--- a/rosjava_helpers/src/main/java/org/ros/helpers/ParameterLoaderNode.java
+++ b/rosjava_helpers/src/main/java/org/ros/helpers/ParameterLoaderNode.java
@@ -40,7 +40,7 @@ import java.util.Map;
 public class ParameterLoaderNode extends AbstractNodeMain {
 
     public static final String NODE_NAME = "parameter_loader";
-    private final List<LoadedResource> params = new ArrayList<>();
+    private final List<LoadedResource> params = new ArrayList<LoadedResource>();
     private Log log;
 
     /**
@@ -57,6 +57,7 @@ public class ParameterLoaderNode extends AbstractNodeMain {
         this.params.add(new LoadedResource((new Yaml()).load(ymlInputStream), namespace));
     }
 
+    @SuppressWarnings("unchecked")
     private void addParams(ParameterTree parameterTree, String namespace, Map<String, Object> params) {
         for (Map.Entry<String, Object> e : params.entrySet()) {
             String fullKeyName = namespace + "/" + e.getKey();