diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 5112cf87b..0a931758a 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -33,7 +33,7 @@ class WebApplication
      */
     public function setRootDir($rootDir)
     {
-        $this->rootDir = $rootDir;
+        $this->rootDir = rtrim($rootDir, DS);
         $this->workflowDir = $rootDir . DS . "workflow" . DS;
     }
 
@@ -160,7 +160,7 @@ class WebApplication
          */
         header('Access-Control-Allow-Origin: *');
 
-        require_once $this->rootDir . "framework/src/Maveriks/Extension/Restler/UploadFormat.php";
+        require_once $this->rootDir . "/framework/src/Maveriks/Extension/Restler/UploadFormat.php";
 
         // $servicesDir contains directory where Services Classes are allocated
         $servicesDir = $this->workflowDir . 'engine' . DS . 'src' . DS . 'ProcessMaker' . DS . 'Services' . DS;
@@ -383,7 +383,7 @@ class WebApplication
             PATH_RBAC_CORE . PATH_SEPARATOR .
             get_include_path()
         );
-
+        ///print_r(get_include_path()); die;
 
         /*
          * Setting Up Workspace
diff --git a/rbac/engine/classes/model/RbacUsersPeer.php b/rbac/engine/classes/model/RbacUsersPeer.php
index 26d98b455..022747e00 100755
--- a/rbac/engine/classes/model/RbacUsersPeer.php
+++ b/rbac/engine/classes/model/RbacUsersPeer.php
@@ -31,9 +31,9 @@
   require_once 'classes/model/om/BaseRbacUsersPeer.php';
 
   // include object class
-  include_once 'classes/model/RbacUsers.php';
-
+  //include_once 'classes/model/RbacUsers.php';
 
+//die("----LAST --as");
 /**
  * Skeleton subclass for performing query and update operations on the 'USERS' table.
  *
diff --git a/rbac/engine/classes/model/UsersRolesPeer.php b/rbac/engine/classes/model/UsersRolesPeer.php
index 50086ae93..f91079fab 100755
--- a/rbac/engine/classes/model/UsersRolesPeer.php
+++ b/rbac/engine/classes/model/UsersRolesPeer.php
@@ -30,7 +30,7 @@
   require_once 'classes/model/om/BaseUsersRolesPeer.php';
 
   // include object class
-  include_once 'classes/model/UsersRoles.php';
+  //include_once 'classes/model/UsersRoles.php';
 
 
 /**
diff --git a/rbac/engine/classes/model/om/BaseRbacUsersPeer.php b/rbac/engine/classes/model/om/BaseRbacUsersPeer.php
index 373bf685b..8a917aea0 100755
--- a/rbac/engine/classes/model/om/BaseRbacUsersPeer.php
+++ b/rbac/engine/classes/model/om/BaseRbacUsersPeer.php
@@ -3,7 +3,7 @@
 require_once 'propel/util/BasePeer.php';
 // The object class -- needed for instanceof checks in this class.
 // actual class may be a subclass -- as returned by RbacUsersPeer::getOMClass()
-include_once 'classes/model/RbacUsers.php';
+//include_once 'classes/model/RbacUsers.php';
 
 /**
  * Base static class for performing query and update operations on the 'USERS' table.
diff --git a/rbac/engine/classes/model/om/BaseUsersRolesPeer.php b/rbac/engine/classes/model/om/BaseUsersRolesPeer.php
index 083cb396b..a878c6c4c 100755
--- a/rbac/engine/classes/model/om/BaseUsersRolesPeer.php
+++ b/rbac/engine/classes/model/om/BaseUsersRolesPeer.php
@@ -3,7 +3,7 @@
 require_once 'propel/util/BasePeer.php';
 // The object class -- needed for instanceof checks in this class.
 // actual class may be a subclass -- as returned by UsersRolesPeer::getOMClass()
-include_once 'classes/model/UsersRoles.php';
+//include_once 'classes/model/UsersRoles.php';
 
 /**
  * Base static class for performing query and update operations on the 'USERS_ROLES' table.