diff --git a/client/client.c b/client/client.c
index 8711cf0a..d8f0060c 100644
--- a/client/client.c
+++ b/client/client.c
@@ -29,6 +29,7 @@ static char *opt_list = "s:vr";
 static int verbose;
 static char *init_cmd;
 static int once;
+static int restricted;
 
 static char *server_path = PATH_CONTROL_SOCKET;
 static int server_fd;
@@ -70,7 +71,7 @@ parse_args(int argc, char **argv)
 	verbose++;
 	break;
       case 'r':
-	init_cmd = "restrict";
+	restricted = 1;
 	break;
       default:
 	usage();
@@ -83,9 +84,6 @@ parse_args(int argc, char **argv)
       int i;
       int len = 0;
 
-      if (init_cmd)
-	usage();
-
       for (i = optind; i < argc; i++)
 	len += strlen(argv[i]) + 1;
 
@@ -303,6 +301,13 @@ update_state(void)
   if (nstate == cstate)
     return;
 
+  if (restricted)
+    {
+       submit_server_command("restrict");
+       restricted = 0;
+       return;
+    }
+
   if (init_cmd)
     {
       /* First transition - client received hello from BIRD
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 8db0dc1c..92c45f95 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -162,7 +162,7 @@ else: {
   return ELSECOL;
 }
 
-({ALPHA}{ALNUM}*|[']({ALNUM}|[-])*[']) {
+({ALPHA}{ALNUM}*|[']({ALNUM}|[-]|[\.])*[']) {
   if(*yytext == '\'') {
     yytext[yyleng-1] = 0;
     yytext++;
diff --git a/doc/bird.sgml b/doc/bird.sgml
index 762834e3..1baa1528 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -478,7 +478,7 @@ to zero to disable it. An empty <cf><m/switch/</cf> is equivalent to <cf/on/
 	using <cf/show route filtered/. Note that this option does not
 	work for the pipe protocol. Default: off.
 
-	<tag>import limit <m/number/ [action warn | block | restart | disable]</tag>
+	<tag>import limit [<m/number/ | off ] [action warn | block | restart | disable]</tag>
 	Specify an import route limit (a maximum number of routes
 	imported from the protocol) and optionally the action to be
 	taken when the limit is hit. Warn action just prints warning
@@ -486,9 +486,9 @@ to zero to disable it. An empty <cf><m/switch/</cf> is equivalent to <cf/on/
 	protocol. Restart and disable actions shut the protocol down
 	like appropriate commands. Disable is the default action if an
 	action is not explicitly specified. Note that limits are reset
-	during protocol reconfigure, reload or restart. Default: <cf/none/.
+	during protocol reconfigure, reload or restart. Default: <cf/off/.
 
-	<tag>receive limit <m/number/ [action warn | block | restart | disable]</tag>
+	<tag>receive limit [<m/number/ | off ] [action warn | block | restart | disable]</tag>
 	Specify an receive route limit (a maximum number of routes
 	received from the protocol and remembered). It works almost
 	identically to <cf>import limit</cf> option, the only
@@ -498,9 +498,9 @@ to zero to disable it. An empty <cf><m/switch/</cf> is equivalent to <cf/on/
 	receive limit is to protect routing tables from
 	overflow. Import limit, on the contrary, counts accepted
 	routes only and routes blocked by the limit are handled like
-	filtered routes. Default: <cf/none/.
+	filtered routes. Default: <cf/off/.
 
-	<tag>export limit <m/number/ [action warn | block | restart | disable]</tag>
+	<tag>export limit [ <m/number/ | off ] [action warn | block | restart | disable]</tag>
 	Specify an export route limit, works similarly to
 	the <cf>import limit</cf> option, but for the routes exported
 	to the protocol. This option is experimental, there are some
@@ -509,7 +509,7 @@ to zero to disable it. An empty <cf><m/switch/</cf> is equivalent to <cf/on/
 	during protocol reload, exported routes counter ignores route
 	blocking and block action also blocks route updates of already
 	accepted routes -- and these details will probably change in
-	the future. Default: <cf/none/.
+	the future. Default: <cf/off/.
 
 	<tag>description "<m/text/"</tag> This is an optional
 	description of the protocol. It is displayed as a part of the
diff --git a/nest/config.Y b/nest/config.Y
index f4052ae6..5432faa2 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -223,6 +223,7 @@ limit_spec:
      l->action = $2;
      $$ = l;
    }
+ | OFF { $$ = 0; }
  ;
 
 rtable:
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index aa8f1cdf..1ba77252 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -434,7 +434,7 @@ lsadb_args:
      $$ = cfg_allocz(sizeof(struct lsadb_show_data));
    }
  | lsadb_args GLOBAL { $$ = $1; $$->scope = LSA_SCOPE_AS; }
- | lsadb_args AREA idval { $$ = $1; $$->scope = LSA_SCOPE_AREA; $$->area = $3 }
+ | lsadb_args AREA idval { $$ = $1; $$->scope = LSA_SCOPE_AREA; $$->area = $3; }
  | lsadb_args LINK { $$ = $1; $$->scope = 1; /* hack, 0 is no filter */ }
  | lsadb_args TYPE NUM { $$ = $1; $$->type = $3; }
  | lsadb_args LSID idval { $$ = $1; $$->lsid = $3; }
diff --git a/proto/radv/config.Y b/proto/radv/config.Y
index fbec5a0a..c5b7aaee 100644
--- a/proto/radv/config.Y
+++ b/proto/radv/config.Y
@@ -290,8 +290,8 @@ radv_mult:
  ;
 
 radv_sensitive:
-   /* empty */ { $$ = -1 }
- | SENSITIVE bool { $$ = $2 }
+   /* empty */ { $$ = -1; }
+ | SENSITIVE bool { $$ = $2; }
  ;
 
 CF_CODE
diff --git a/proto/static/static.c b/proto/static/static.c
index 29085476..f1359b00 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -460,7 +460,7 @@ static_reconfigure(struct proto *p, struct proto_config *new)
   WALK_LIST(r, n->iface_routes)
     {
       struct iface *ifa;
-      if (ifa = if_find_by_name(r->if_name))
+      if ((ifa = if_find_by_name(r->if_name)) && (ifa->flags & IF_UP))
 	static_install(p, r, ifa);
     }
   WALK_LIST(r, n->other_routes)