diff --git a/elements/tunnel/gtpdecap.hh b/elements/tunnel/gtpdecap.hh
index 9d00626916..9520872777 100644
--- a/elements/tunnel/gtpdecap.hh
+++ b/elements/tunnel/gtpdecap.hh
@@ -12,7 +12,7 @@ GTPDecap()
 
 decapsulates GTP packet
 
-=s gtp
+=s tunnel
 
 =d
 
diff --git a/elements/tunnel/gtpencap.hh b/elements/tunnel/gtpencap.hh
index 100619da5b..5b61a655de 100644
--- a/elements/tunnel/gtpencap.hh
+++ b/elements/tunnel/gtpencap.hh
@@ -12,7 +12,7 @@ GTPEncap(TEID eid)
 
 encapsulates GTP packets
 
-=s gtp
+=s tunnel
 
 =d
 
diff --git a/elements/tunnel/gtplookup.hh b/elements/tunnel/gtplookup.hh
index 5dde4995ae..644eba0b11 100644
--- a/elements/tunnel/gtplookup.hh
+++ b/elements/tunnel/gtplookup.hh
@@ -11,7 +11,7 @@ CLICK_DECLS
 
 GTPLookup()
 
-=s gtp
+=s tunnel
 
 Encapsulates packets in their intended GTP return id.
 
diff --git a/elements/tunnel/gtptable.hh b/elements/tunnel/gtptable.hh
index eed88add19..3778d0bcc7 100644
--- a/elements/tunnel/gtptable.hh
+++ b/elements/tunnel/gtptable.hh
@@ -57,7 +57,7 @@ GTPTable()
 
 Find mapping of the GTP tunnel id return side
 
-=s gtp
+=s tunnel
 
 =d
 
diff --git a/tools/click-devirtualize/specializer.cc b/tools/click-devirtualize/specializer.cc
index cf5109c9a0..587ca62503 100644
--- a/tools/click-devirtualize/specializer.cc
+++ b/tools/click-devirtualize/specializer.cc
@@ -34,7 +34,7 @@ Specializer::Specializer(RouterT *router, const ElementMap &em)
   : _router(router), _nelements(router->nelements()),
     _ninputs(router->nelements(), 0), _noutputs(router->nelements(), 0),
     _etinfo_map(0), _header_file_map(-1), _parsed_sources(-1), _do_inline(false),
-    _do_static(false), _do_unroll(false), _unroll_val(0), _switch_burst(0),
+    _do_static(false), _do_switch(false), _do_unroll(false), _unroll_val(0), _switch_burst(0),
     _do_jmps(false), _jmp_burst(0), _do_align(0), _verbose(false)
 {
   _etinfo.push_back(ElementTypeInfo());