diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java
index a70fed9e47..b4076a8abe 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java
@@ -275,7 +275,8 @@ public class CollaborationDataManager implements IRosterEventSubscriber {
         SessionContainer container = SharedDisplaySessionMgr
                 .getSessionContainer(session.getSessionId());
         container.setCollaborationEditor(editor);
-        editor.setTabTitle(((IVenueSession) session).getSubject());
+        editor.setTabTitle(((IVenueSession) session).getVenue().getInfo()
+                .getVenueDescription());
     }
 
     /**
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/EditorSetup.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/EditorSetup.java
index 49716ee5e5..dab0766c03 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/EditorSetup.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/EditorSetup.java
@@ -172,7 +172,10 @@ public class EditorSetup {
         desc.getResourceList().instantiateResources(desc, true);
         SharedEditorIndicatorRsc rsc = (SharedEditorIndicatorRsc) rp
                 .getResource();
-        rsc.setSubject(((IVenueSession) session).getSubject());
+        rsc.setRoomName(((IVenueSession) session).getVenue().getInfo()
+                .getVenueDescription());
+        rsc.setSubject(((IVenueSession) session).getVenue().getInfo()
+                .getVenueSubject());
 
         // TODO we need to track editors associated with a session
 
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/rsc/SharedEditorIndicatorRsc.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/rsc/SharedEditorIndicatorRsc.java
index 4766433040..2bbb5824e5 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/rsc/SharedEditorIndicatorRsc.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/rsc/SharedEditorIndicatorRsc.java
@@ -48,6 +48,8 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
 public class SharedEditorIndicatorRsc extends
         AbstractVizResource<GenericResourceData, IDescriptor> {
 
+    protected String roomName;
+
     protected String subject;
 
     public SharedEditorIndicatorRsc(GenericResourceData resourceData,
@@ -75,7 +77,15 @@ public class SharedEditorIndicatorRsc extends
     }
 
     public String getName() {
-        return "Sharing with " + subject;
+        String text = "Sharing with " + roomName;
+        if (!"".equals(subject)) {
+            text += " (" + subject + ")";
+        }
+        return text;
+    }
+
+    public void setRoomName(String name) {
+        this.roomName = name;
     }
 
     public void setSubject(String subject) {
diff --git a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/identity/IVenueSession.java b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/identity/IVenueSession.java
index b9c65b29ab..2ad6ed3419 100644
--- a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/identity/IVenueSession.java
+++ b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/identity/IVenueSession.java
@@ -80,21 +80,6 @@ public interface IVenueSession extends ISession, IEventPublisher {
      */
     boolean hasRole(ParticipantRole role);
 
-    /**
-     * Set the subject of this collaboration venue conversation.
-     * 
-     * @param subject
-     *            The subject.
-     */
-    void setSubject(String subject);
-
-    /**
-     * Get the subject of this collaboration venue conversation.
-     * 
-     * @return The subject.
-     */
-    String getSubject();
-
     /**
      * Send a Collaboration message.
      * 
diff --git a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/VenueSession.java b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/VenueSession.java
index 81813eaaa8..ef1b6eb46c 100644
--- a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/VenueSession.java
+++ b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/VenueSession.java
@@ -801,5 +801,4 @@ public class VenueSession extends BaseSession implements IVenueSession,
         }
         return message;
     }
-
 }
diff --git a/cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/tools/PathDrawingTool.java b/cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/tools/PathDrawingTool.java
index 70338fc292..cd210d1276 100644
--- a/cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/tools/PathDrawingTool.java
+++ b/cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/tools/PathDrawingTool.java
@@ -227,9 +227,12 @@ public class PathDrawingTool extends AbstractDrawingTool {
 
         editor.unregisterMouseHandler(getMouseHandler());
         // change the cursor back
-        Cursor cursor = new Cursor(Display.getCurrent(), SWT.CURSOR_ARROW);
-        Display.getCurrent().getActiveShell().setCursor(cursor);
-        cursor.dispose();
+        if (Display.getCurrent() != null
+                && Display.getCurrent().getActiveShell() != null) {
+            Cursor cursor = new Cursor(Display.getCurrent(), SWT.CURSOR_ARROW);
+            Display.getCurrent().getActiveShell().setCursor(cursor);
+            cursor.dispose();
+        }
         theDrawingLayer = null;
     }
 }