diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 86d70f299..8d447632f 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -154,6 +154,7 @@
                     <dialects>
                         <param>h2</param>
                         <param>mysql5_innodb</param>
+                        <param>oracle10g</param>
                         <param>postgresql9</param>
                     </dialects>
                     <packages>
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Category.java b/ccm-core/src/main/java/org/libreccm/categorization/Category.java
index 494c52b80..f431ee88b 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/Category.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Category.java
@@ -86,10 +86,11 @@ public class Category extends CcmObject implements Serializable {
     @OneToMany(mappedBy = "category")
     private List<Categorization> objects;
 
-    @OneToMany(mappedBy = "parent_category")
+    @OneToMany(mappedBy = "parentCategory")
     private List<Category> subCategories;
 
     @ManyToOne
+    @JoinColumn(name = "parent_category_id")
     private Category parentCategory;
 
     @Column(name = "category_order")
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
index b962df84d..748e02e53 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Domain.java
@@ -80,9 +80,10 @@ public class Domain extends CcmObject implements Serializable {
     private Date released;
     
     @ManyToOne
+    @JoinColumn(name = "root_category_id")
     private Category root;
     
-    @OneToMany(mappedBy = "domain_id")
+    @OneToMany(mappedBy = "domain")
     private List<DomainOwnership> owners;
 
     public String getDomainKey() {