diff --git a/opts.c b/opts.c
index 9383899..00e6a65 100644
--- a/opts.c
+++ b/opts.c
@@ -334,6 +334,17 @@ proxyspec_parse(int *argc, char **argv[], const char *natengine)
 			case 1:
 				/* listenaddr */
 				addr = **argv;
+
+				/* XXX: E2 address defs */
+				/* TODO: Make this command line or conf file option */
+				sys_sockaddr_parse(&spec->e2src_addr,
+									&spec->e2src_addrlen,
+									"127.0.0.1", "8080", AF_INET, 0);
+
+				sys_sockaddr_parse(&spec->e2dst_addr,
+									&spec->e2dst_addrlen,
+									"127.0.0.1", "0", AF_INET, 0);
+	
 				state++;
 				break;
 			case 2:
@@ -438,15 +449,15 @@ proxyspec_parse(int *argc, char **argv[], const char *natengine)
 		exit(EXIT_FAILURE);
 	}
 
-	sys_sockaddr_parse(&spec->e2src_addr,
-						&spec->e2src_addrlen,
-						"127.0.0.1", "8080", AF_INET, 0);
-//						"127.0.0.1", "8128", AF_INET, 0);
-
-	sys_sockaddr_parse(&spec->e2dst_addr,
-						&spec->e2dst_addrlen,
-//						"127.0.0.1", "8128", AF_INET, 0);
-						"127.0.0.1", "0", AF_INET, 0);
+//	sys_sockaddr_parse(&spec->e2src_addr,
+//						&spec->e2src_addrlen,
+//						"127.0.0.1", "8080", AF_INET, 0);
+////						"127.0.0.1", "8128", AF_INET, 0);
+//
+//	sys_sockaddr_parse(&spec->e2dst_addr,
+//						&spec->e2dst_addrlen,
+////						"127.0.0.1", "8128", AF_INET, 0);
+//						"127.0.0.1", "0", AF_INET, 0);
 
 	return spec;
 }
diff --git a/proxy.c b/proxy.c
index de50bed..d0b6fca 100644
--- a/proxy.c
+++ b/proxy.c
@@ -247,7 +247,7 @@ proxy_listener_acceptcb(UNUSED struct evconnlistener *listener,
 
 	log_dbg_printf(">>>>>------------------------------------------------------------------------------------ proxy_listener_acceptcb(): fd=%d, previous fd2=%d\n", fd, lctx->fd2);
 
-	log_dbg_printf(">>>>> proxy_listener_acceptcb: SETTING UP E2\n");
+	log_dbg_printf(">>>>> proxy_listener_acceptcb: SETTING UP E2, lctx->clisock=%d\n", lctx->clisock);
 	evutil_socket_t fd2;
 	if ((fd2 = privsep_client_opensock_e2(lctx->clisock, lctx->spec)) == -1) {
 		log_err_printf("Error opening socket: %s (%i)\n",