diff --git a/gf.cabal b/gf.cabal
index 0d0aefcbd..63d36976b 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -1,5 +1,5 @@
 name: gf
-version: 3.6
+version: 3.6-darcs
 
 cabal-version: >= 1.10
 build-type: Custom
diff --git a/src/compiler/GF/Infra/Option.hs b/src/compiler/GF/Infra/Option.hs
index 80606c0a9..88767c72e 100644
--- a/src/compiler/GF/Infra/Option.hs
+++ b/src/compiler/GF/Infra/Option.hs
@@ -1,4 +1,3 @@
--- LANGUAGE CPP
 module GF.Infra.Option
     (
      -- * Option types
@@ -285,14 +284,7 @@ defaultFlags = Flags {
       optTagsOnly        = False,
       optHeuristicFactor = Nothing,
       optMetaProb        = Nothing,
-      optMetaToknProb    = Nothing{-,
-      optNewComp         =
-#ifdef NEW_COMP
-                           True
-#else
-                           False
-#endif
--}
+      optMetaToknProb    = Nothing
     }
 
 -- | Option descriptions
diff --git a/src/compiler/GF/Text/Coding.hs b/src/compiler/GF/Text/Coding.hs
index 3669733d0..bac7938c0 100644
--- a/src/compiler/GF/Text/Coding.hs
+++ b/src/compiler/GF/Text/Coding.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 module GF.Text.Coding where
 
 import qualified Data.ByteString as BS
@@ -25,11 +23,7 @@ encodeUnicode enc s =
   where
     translate cod cbuf
       | i < w     = do bbuf <- newByteBuffer 128 WriteBuffer
-#if __GLASGOW_HASKELL__ >= 702
                        (_,cbuf,bbuf) <- cod cbuf bbuf
-#else
-                       (cbuf,bbuf) <- cod cbuf bbuf
-#endif
                        if isEmptyBuffer bbuf
                          then ioe_invalidCharacter1
                          else do let bs = PS (bufRaw bbuf) (bufL bbuf) (bufR bbuf-bufL bbuf)
@@ -54,11 +48,7 @@ decodeUnicodeIO enc (PS fptr l len) = do
   where
     translate cod bbuf cbuf
       | i < w     = do
-#if __GLASGOW_HASKELL__ >= 702
                        (_,bbuf,cbuf) <- cod bbuf cbuf
-#else
-                       (bbuf,cbuf) <- cod bbuf cbuf
-#endif
                        if isEmptyBuffer cbuf
                          then ioe_invalidCharacter2
                          else unpack cod bbuf cbuf
diff --git a/src/www/minibar/minibar.js b/src/www/minibar/minibar.js
index 4c68173e9..c299cb77c 100644
--- a/src/www/minibar/minibar.js
+++ b/src/www/minibar/minibar.js
@@ -244,8 +244,13 @@ Minibar.prototype.show_grammarinfo=function() {
     var btn=button("More info",more)
 
     clear(t.translations.main)
+    var hdr=[text(g.name)]
+    if(g.lastmodified) {
+	hdr.push(text(" "))
+	hdr.push(wrap("small",text("("+g.lastmodified+")")))
+    }
     appendChildren(this.translations.main,
-		   [wrap("h3",text(g.name)),
+		   [wrap("h3",hdr),
 		    btn,
 		    wrap("h4",text("Start category")), text(g.startcat || ""),
 		    wrap("h4",text("Categories")), cats,