diff --git a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl
index d5d42e45d..670511f8b 100644
--- a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl
+++ b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/OrganizationRole.pdl
@@ -39,7 +39,7 @@ query getRefferingRoles {
       BigDecimal id;
 
       do {
-      	 select r.role_id from organizationroles r where r.target_item_id = :itemID
+      	 select r.role_id from ct_organizationroles r where r.target_item_id = :itemID
       } map {
       	id = r.role_id;
       }
diff --git a/ccm-cms-types-project/sql/ccm-cms-types-project/postgres-create.sql b/ccm-cms-types-project/sql/ccm-cms-types-project/postgres-create.sql
new file mode 100644
index 000000000..a733590e2
--- /dev/null
+++ b/ccm-cms-types-project/sql/ccm-cms-types-project/postgres-create.sql
@@ -0,0 +1,3 @@
+begin;
+\i ddl/postgres/create.sql
+end;
\ No newline at end of file
diff --git a/ccm-cms-types-project/web/static/content-types/com/arsdigita/cms/contenttypes/Project.xsl b/ccm-cms-types-project/web/static/content-types/com/arsdigita/cms/contenttypes/Project.xsl
new file mode 100644
index 000000000..85137dad7
--- /dev/null
+++ b/ccm-cms-types-project/web/static/content-types/com/arsdigita/cms/contenttypes/Project.xsl
@@ -0,0 +1,11 @@
+<!DOCTYPE stylesheet [
+<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
+]>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:cms="http://www.arsdigita.com/cms/1.0"
+  version="1.0">
+  
+  <!-- ToDo: Add stylesheet here -->
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/tools-ng/common/xsl/build-template.xsl b/tools-ng/common/xsl/build-template.xsl
index d2553435e..425d2c1aa 100755
--- a/tools-ng/common/xsl/build-template.xsl
+++ b/tools-ng/common/xsl/build-template.xsl
@@ -1225,11 +1225,11 @@
                 <fileset dir="tools-ng/webxml/lib" includes="*.jar"/>
             </classpath>
             importClass(java.lang.System);
-            importClass(com.liferay.portal.tools.WebXMLBuilder);
-            importClass(com.liferay.portal.kernel.util.FileUtil);
-            importClass(com.liferay.portal.util.FileImpl);
-            importClass(com.liferay.portal.xml.SAXReaderImpl);
-            importClass(com.liferay.portal.kernel.xml.SAXReaderUtil);
+            importClass(Packages.com.liferay.portal.tools.WebXMLBuilder);
+            importClass(Packages.com.liferay.portal.kernel.util.FileUtil);
+            importClass(Packages.com.liferay.portal.util.FileImpl);
+            importClass(Packages.com.liferay.portal.xml.SAXReaderImpl);
+            importClass(Packages.com.liferay.portal.kernel.xml.SAXReaderUtil);
             new FileUtil().setFile(FileImpl.getInstance());
             new SAXReaderUtil().setSAXReader(new SAXReaderImpl());
             var builder = new WebXMLBuilder(originalWebXML, customWebXML, mergedWebXML);