diff --git a/netstack/src/main.rs b/netstack/src/main.rs
index b0d654cd80..4b1ea55f3b 100644
--- a/netstack/src/main.rs
+++ b/netstack/src/main.rs
@@ -194,7 +194,7 @@ fn run(daemon: daemon::Daemon) -> Result<()> {
 
     let all = {
         use EventSource::*;
-        [Network, Time, IpScheme, UdpScheme, IcmpScheme, NetcfgScheme, NetfilterScheme, TunScheme].map(Ok)
+        [Network, Time, IpScheme, UdpScheme, TcpScheme, IcmpScheme, NetcfgScheme, NetfilterScheme, TunScheme].map(Ok)
     };
 
     for event_res in all
diff --git a/netstack/src/scheme/netcfg/mod.rs b/netstack/src/scheme/netcfg/mod.rs
index 3bc3bc3b29..edfeb4c44e 100644
--- a/netstack/src/scheme/netcfg/mod.rs
+++ b/netstack/src/scheme/netcfg/mod.rs
@@ -339,13 +339,14 @@ fn mk_root_node(
                 wo [iface, notifier, route_table] (Option<IpCidr>, None)
                 |cur_value, line| {
                     if cur_value.is_none() {
-                        match line.parse() {
-                            Ok(cidr) => {
-                                *cur_value = Some(cidr);
-                                Ok(())
-                            }
-                            Err(_) => Err(SyscallError::new(syscall::EINVAL))
-                        }
+                        let cidr = if line.trim() == "default" {
+                            gateway_cidr()
+                        } else {
+                            line.parse::<IpCidr>()
+                                .map_err(|_| SyscallError::new(syscall::EINVAL))?
+                        };
+                        *cur_value = Some(cidr);
+                        Ok(())
                     } else {
                         Err(SyscallError::new(syscall::EINVAL))
                     }
diff --git a/netstack/src/scheme/socket.rs b/netstack/src/scheme/socket.rs
index 8028710c4d..dfdd3372b8 100644
--- a/netstack/src/scheme/socket.rs
+++ b/netstack/src/scheme/socket.rs
@@ -329,8 +329,8 @@ where
         }?;
 
         let mut timeout = match op {
-            Op::Read(_) => write_timeout,
-            Op::Write(_) => read_timeout,
+            Op::Read(_) => read_timeout,
+            Op::Write(_) => write_timeout,
             _ => None,
         };