diff --git a/tools/plugin.py b/tools/plugin.py
index 3209b984..2716ea79 100644
--- a/tools/plugin.py
+++ b/tools/plugin.py
@@ -54,7 +54,7 @@ def extractVariables(variableLines):
                     vars = extractVariables(c[1:])
                     try:
                         modulePath = "{0}.{1}".format(path.split(pluginPath)[1].replace("/",".").replace("\\","."),name.split(".py")[0])
-                        modules[defType][defName] =  { "path" : modulePath, "vars" : vars }
+                        modules[defType][defName] =  { "path" : modulePath[1:], "vars" : vars }
                     except:
                         pass
     return modules
@@ -107,11 +107,11 @@ def writeManifest(name,path,manifest):
                 if field[0] == "version":
                     manifest["version"] = float(field[1])
         objectType = ""
-        if classType == "db._document":
+        if classType.endswith("db._document"):
             objectType = "collections"
-        elif classType == "trigger._trigger":
+        elif classType.endswith("trigger._trigger"):
             objectType = "triggers"
-        elif classType == "action._action":
+        elif classType.endswith("action._action"):
             objectType = "actions"
         if objectType:
             objectName = module