diff --git a/Trakttv.bundle/Contents/Code/bootstrap.py b/Trakttv.bundle/Contents/Code/bootstrap.py
index e21b1174a..095fd6e24 100644
--- a/Trakttv.bundle/Contents/Code/bootstrap.py
+++ b/Trakttv.bundle/Contents/Code/bootstrap.py
@@ -119,7 +119,7 @@ def initialize_environment(self):
 
         # plex.database.py
         os.environ['LIBRARY_DB'] = os.path.join(
-            Environment.path.plugin_support, 'Databases',
+            Core.plugin_support_path, 'Databases',
             'com.plexapp.plugins.library.db'
         )
 
diff --git a/Trakttv.bundle/Contents/Code/fs_migrator.py b/Trakttv.bundle/Contents/Code/fs_migrator.py
index 5764978a4..3177f831a 100644
--- a/Trakttv.bundle/Contents/Code/fs_migrator.py
+++ b/Trakttv.bundle/Contents/Code/fs_migrator.py
@@ -39,7 +39,7 @@ def plex_path(self):
 
     @property
     def preferences_path(self):
-        return os.path.join(self.plex_path, 'Plug-in Support', 'Preferences', 'com.plexapp.plugins.trakttv.xml')
+        return os.path.join(Core.plugin_support_path, 'Preferences', 'com.plexapp.plugins.trakttv.xml')
 
     def get_preferences(self):
         if not os.path.exists(self.preferences_path):
diff --git a/Trakttv.bundle/Contents/Libraries/Shared/plugin/core/environment.py b/Trakttv.bundle/Contents/Libraries/Shared/plugin/core/environment.py
index 622bd48e6..09f72b475 100644
--- a/Trakttv.bundle/Contents/Libraries/Shared/plugin/core/environment.py
+++ b/Trakttv.bundle/Contents/Libraries/Shared/plugin/core/environment.py
@@ -33,7 +33,7 @@ def home(self):
 
     @property
     def libraries(self):
-        return os.path.join(self.contents, 'Libraries')
+        return os.path.join(self._core.plugin_support_path, 'Libraries')
 
     @property
     def locale(self):
@@ -41,15 +41,15 @@ def locale(self):
 
     @property
     def plugin_caches(self):
-        return os.path.join(self.plugin_support, 'Caches', PLUGIN_IDENTIFIER)
+        return os.path.join(self._core.plugin_support_path, 'Caches', PLUGIN_IDENTIFIER)
 
     @property
     def plugin_data(self):
-        return os.path.join(self.plugin_support, 'Data', PLUGIN_IDENTIFIER)
+        return os.path.join(self._core.plugin_support_path, 'Data', PLUGIN_IDENTIFIER)
 
     @property
     def plugin_database(self):
-        return os.path.join(self.plugin_support, 'Databases', '%s.db' % PLUGIN_IDENTIFIER)
+        return os.path.join(self._core.plugin_support_path, 'Databases', '%s.db' % PLUGIN_IDENTIFIER)
 
     @property
     def plugin_support(self):