diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index a20993d2d4..52850a653b 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -45,8 +45,6 @@
 #   testmode:
 #     Set this to true to disable cron jobs and replication,
 #     which can interfere with testing.
-# TODO: move apache configuration to another module
-# TODO: move mysql configuration to another module
 # TODO: make more gerrit options configurable here
 
 class gerrit($virtual_hostname=$fqdn,
@@ -83,7 +81,7 @@ class gerrit($virtual_hostname=$fqdn,
 
   $java_home = $lsbdistcodename ? {
       "precise" => "/usr/lib/jvm/java-6-openjdk-amd64/jre",
-      default => "/usr/lib/jvm/java-6-openjdk/jre",
+      "oneiric" => "/usr/lib/jvm/java-6-openjdk/jre",
     }
 
   user { "gerrit2":
diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb
index ff4e7a8fe2..1ba396c171 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -22,7 +22,7 @@
 	smtpServer = localhost
 [container]
 	user = gerrit2
-	javaHome = <% java_home %>
+	javaHome = <%= java_home %>
 <% if container_heaplimit != "" -%>
 	heapLimit = <%= container_heaplimit %>
 <% end -%>