diff --git a/doc/org/concepts.org b/doc/org/concepts.org
index 1a8a6709b..66237fadb 100644
--- a/doc/org/concepts.org
+++ b/doc/org/concepts.org
@@ -836,7 +836,7 @@ $txt
    :CUSTOM_ID: hoa
    :END:
 
-The [[http://adl.github.io/hoaf/][HOA format]] inherits several features from the [[:dstar][DSTAR format]], but
+The [[http://adl.github.io/hoaf/][HOA format]] inherits several features from the [[#dstar][DSTAR format]], but
 extends it in many ways, including support for non-deterministic
 automata, alternating automata, and for arbitrary acceptance conditions.
 
@@ -1107,7 +1107,7 @@ correspond to any =twa= flag.
    :CUSTOM_ID: named-properties
    :END:
 
-In addition to [[#proeprty-flags][property flags]], automata in Spot can be tied to an
+In addition to [[#property-flags][property flags]], automata in Spot can be tied to an
 arbitrary number of objects via a system of named properties that is
 implemented mostly as an =std::map= between =std::string= and =void*=.
 
diff --git a/doc/org/ioltl.org b/doc/org/ioltl.org
index 210a5e4b2..2b26d591b 100644
--- a/doc/org/ioltl.org
+++ b/doc/org/ioltl.org
@@ -44,7 +44,7 @@ Spot's default LTL parser is able to parse the syntaxes of many tools,
 such as [[http://spinroot.com][Spin]], [[http://vlsi.colorado.edu/~rbloem/wring.html][Wring]], [[http://goal.im.ntu.edu.tw][Goal]], etc.  For instance here are the preferred ways
 to express the same formula for different tools.
 
-# <<tab:formula-syntaxes>>
+#+NAME: tab:formula-syntaxes
 | Tool         | Formula                 |
 |--------------+-------------------------|
 | Spot         | =G(a -> (b R !c))=      |
diff --git a/doc/org/tut51.org b/doc/org/tut51.org
index 1cf58d628..416b1c9c4 100644
--- a/doc/org/tut51.org
+++ b/doc/org/tut51.org
@@ -377,23 +377,23 @@ this reason.
  <<demo-succ-iter-2>>
 #+END_SRC
 
- #+NAME: demo-1
- #+BEGIN_SRC C++ :exports code :noweb strip-export :results verbatim
- #include <spot/twaalgos/dot.hh>
- <<demo-1-aux>>
- int main()
- {
-    auto k = std::make_shared<demo_kripke>(spot::make_bdd_dict());
-    spot::print_dot(std::cout, k);
- }
- #+END_SRC
+#+NAME: demo-1
+#+BEGIN_SRC C++ :exports code :noweb strip-export :results verbatim
+#include <spot/twaalgos/dot.hh>
+<<demo-1-aux>>
+int main()
+{
+   auto k = std::make_shared<demo_kripke>(spot::make_bdd_dict());
+   spot::print_dot(std::cout, k);
+}
+#+END_SRC
 
- #+BEGIN_SRC dot :file kripke-1.svg :cmd circo :var txt=demo-1 :exports results
- $txt
- #+END_SRC
+#+BEGIN_SRC dot :file kripke-1.svg :cmd circo :var txt=demo-1 :exports results
+$txt
+#+END_SRC
 
- #+RESULTS:
- q[[file:kripke-1.svg]]
+#+RESULTS:
+[[file:kripke-1.svg]]
 
 * Checking a property on this state space
 
diff --git a/doc/org/upgrade2.org b/doc/org/upgrade2.org
index 500b9d03c..110661f41 100644
--- a/doc/org/upgrade2.org
+++ b/doc/org/upgrade2.org
@@ -85,7 +85,7 @@ experience of updating a couple of projects that are using Spot.
 
 * Upgrading to C++14
   :PROPERTIES:
-  :CUSTOM_ID: cpp11
+  :CUSTOM_ID: cpp14
   :END:
 
   Because Spot now relies on C++14 features, programs that use Spot