diff --git a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java
index 95b779a3c3..315a0c04e2 100644
--- a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java
+++ b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/HtmlRepresentation.java
@@ -30,6 +30,7 @@ import javax.xml.transform.stream.StreamResult;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.mime.MediaType;
 import org.apache.tika.sax.XHTMLContentHandler;
 import org.xml.sax.SAXException;
@@ -125,7 +126,7 @@ class HtmlRepresentation implements Representation {
             handler.setResult(new StreamResult(response.getOutputStream()));
 
             Metadata metadata = new Metadata();
-            metadata.set(Metadata.TITLE, title);
+            metadata.set(TikaCoreProperties.TITLE, title);
             return new XHTMLContentHandler(handler, metadata);
         } catch (TransformerConfigurationException e) {
             throw new IOException(e);
diff --git a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java
index e31b78bac8..40169d9325 100644
--- a/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java
+++ b/oak-http/src/main/java/org/apache/jackrabbit/oak/http/JsonRepresentation.java
@@ -73,7 +73,7 @@ class JsonRepresentation implements Representation {
     protected JsonGenerator startResponse(HttpServletResponse response)
             throws IOException {
         response.setContentType(type.toString());
-        return factory.createJsonGenerator(response.getOutputStream());
+        return factory.createGenerator(response.getOutputStream());
     }
 
     private static void render(Tree tree, JsonGenerator generator)
diff --git a/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java b/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
index 3be146b0c1..6c7687ced8 100644
--- a/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
+++ b/oak-http/src/test/java/org/apache/jackrabbit/oak/http/AcceptHeaderTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.http;
 
-import static junit.framework.Assert.assertEquals;
+//import static junit.framework.Assert.assertEquals;
 
 import org.junit.Test;