diff --git a/vistrails/gui/mashups/mashup_app.py b/vistrails/gui/mashups/mashup_app.py
index 89e97884e..20cf30b7d 100644
--- a/vistrails/gui/mashups/mashup_app.py
+++ b/vistrails/gui/mashups/mashup_app.py
@@ -32,6 +32,7 @@
 ## ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ##
 ###############################################################################
+import os
 from PyQt4 import QtCore, QtGui
 from PyQt4.QtCore import pyqtSignal
 
@@ -614,8 +615,9 @@ class TestMashupApp(TestVisTrailsGUI):
     def test_load_mashup(self):
         import vistrails.api
         import vistrails.core.system
-        filename = (vistrails.core.system.vistrails_root_directory() +
-                    '/tests/resources/spx_loop.vt')
+        filename = os.path.join(
+                vistrails.core.system.vistrails_root_directory(),
+                'tests/resources/spx_loop.vt')
         view = vistrails.api.open_vistrail_from_file(filename)
         view.controller.flush_delayed_actions()
         id = "d5026457-de6c-11e2-b074-3c07543dba07"
diff --git a/vistrails/gui/version_prop.py b/vistrails/gui/version_prop.py
index 80846085b..0767ddf2b 100644
--- a/vistrails/gui/version_prop.py
+++ b/vistrails/gui/version_prop.py
@@ -768,6 +768,7 @@ def __init__(self, parent=None):
         QtGui.QWidget.__init__(self, parent)
         self.versionNumber = None
         self.controller = None
+        self.mtrail = None
         #label = QtGui.QLabel("Mashups:")
         self.mashupsButton = QtGui.QToolButton()
         self.mashupsButton.setText("Mashups")