diff --git a/conf.c b/conf.c
index 6794508..e29b6a9 100644
--- a/conf.c
+++ b/conf.c
@@ -1312,7 +1312,7 @@ void conf(struct ctx *c, int argc, char **argv)
 	c->udp.fwd_in.mode = c->udp.fwd_out.mode = FWD_UNSET;
 	memcpy(c->our_tap_mac, MAC_OUR_LAA, ETH_ALEN);
 
-	optind = 1;
+	optind = 0;
 	do {
 		name = getopt_long(argc, argv, optstring, options, NULL);
 
@@ -1712,7 +1712,7 @@ void conf(struct ctx *c, int argc, char **argv)
 	 * settings)
 	 */
 	udp_portmap_clear();
-	optind = 1;
+	optind = 0;
 	do {
 		name = getopt_long(argc, argv, optstring, options, NULL);
 
@@ -1782,7 +1782,7 @@ void conf(struct ctx *c, int argc, char **argv)
 		nl_sock_init(c, true);
 
 	/* ...and outbound port options now that namespaces are set up. */
-	optind = 1;
+	optind = 0;
 	do {
 		name = getopt_long(argc, argv, optstring, options, NULL);
 
diff --git a/util.c b/util.c
index f9f8113..6e64279 100644
--- a/util.c
+++ b/util.c
@@ -728,7 +728,7 @@ void close_open_files(int argc, char **argv)
 	int name, rc;
 
 	do {
-		name = getopt_long(argc, argv, "+:F", optfd, NULL);
+		name = getopt_long(argc, argv, "-:F:", optfd, NULL);
 
 		if (name == 'F') {
 			errno = 0;