diff --git a/src/JuliaReport.jl b/src/JuliaReport.jl
index f24fe25..e4b430a 100644
--- a/src/JuliaReport.jl
+++ b/src/JuliaReport.jl
@@ -18,7 +18,7 @@ type Report <: Display
   cur_chunk::Dict
 
   function Report()
-        new("", false, "", "",  Any[], "", "", {}, "", 1, {},  @compat Dict{Symbol, Any}())
+        new("", false, "", "",  Any[], "", "", Any[], "", 1, Any[],  @compat Dict{Symbol, Any}())
   end
 
 end
@@ -26,9 +26,8 @@ end
 const report = Report()
 
 const supported_mime_types =
-    {
-      MIME"image/png",
-      MIME"text/plain" }
+    [MIME"image/png",
+     MIME"text/plain"]
 
 function display(doc::Report, data)
     for m in supported_mime_types
diff --git a/src/formatters.jl b/src/formatters.jl
index b06de4e..6194fd1 100644
--- a/src/formatters.jl
+++ b/src/formatters.jl
@@ -48,7 +48,7 @@ function format_codechunk(chunk, formatdict)
         result = format_termchunk(chunk, formatdict)
     else
         if chunk[:wrap]
-          chunk[:result] = "\n" * wrap(chunk[:result])
+          chunk[:result] = "\n" * wrap(chunk[:result], replace_whitespace=false)
         end
 
         if chunk[:echo]