diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15af3a1a..59ea7bcc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,13 +69,13 @@ option (PNET_OPTION_DRIVER_ENABLE "Enable drivers. Specific driver must be enabl
 # TODO: this should be handled in cc.h
 option (PNET_USE_ATOMICS "Enable use of atomic operations (stdatomic.h)" OFF)
 
-set(PNET_MAX_AR                 1
+set(PNET_MAX_AR                 2
   CACHE STRING "Number of connections. Must be > 0. If > 1, support shared device")
 set(PNET_MAX_API                1
   CACHE STRING "Number of Application Processes. Must be > 0")
 set(PNET_MAX_CR                 2
   CACHE STRING "Per AR. At least 2 (1 input and 1 output). If unsure, use 2.")
-set(PNET_MAX_SLOTS            5
+set(PNET_MAX_SLOTS            13
   CACHE STRING "Per API. Should be > 1 to allow at least one I/O module")
 set(PNET_MAX_SUBSLOTS         3
   CACHE STRING "Per slot (DAP requires 2 + PNET_MAX_PHYSICAL_PORTS)")
@@ -113,7 +113,7 @@ set(PNET_MAX_PORT_DESCRIPTION_SIZE 60
 set(LOG_STATE_VALUES "ON;OFF")
 set(LOG_LEVEL_VALUES "DEBUG;INFO;WARNING;ERROR;FATAL")
 
-set(LOG_LEVEL FATAL CACHE STRING "default log level")
+set(LOG_LEVEL INFO CACHE STRING "default log level")
 set_property(CACHE LOG_LEVEL PROPERTY STRINGS ${LOG_LEVEL_VALUES})
 
 set(PF_ETH_LOG ON CACHE STRING "pf_eth log")
diff --git a/src/device/pf_diag.c b/src/device/pf_diag.c
index 7c8b602f..caa7bc82 100644
--- a/src/device/pf_diag.c
+++ b/src/device/pf_diag.c
@@ -234,7 +234,7 @@ static void pf_diag_find_entry (
                (p_item->fmt.std.ch_nbr == p_diag_source->ch) &&
                (p_item->fmt.std.ch_error_type == ch_error_type) &&
                (p_item->fmt.std.ext_ch_error_type == ext_ch_error_type) &&
-               (PF_DIAG_CH_PROP_ACC_GET (p_item->fmt.std.ch_properties) ==
+               ((pnet_diag_ch_group_values_t)PF_DIAG_CH_PROP_ACC_GET (p_item->fmt.std.ch_properties) ==
                 p_diag_source->ch_grouping) &&
                (PF_DIAG_CH_PROP_DIR_GET (p_item->fmt.std.ch_properties) ==
                 p_diag_source->ch_direction))
diff --git a/src/ports/linux/pnal.c b/src/ports/linux/pnal.c
index e7d48c98..d02535ad 100644
--- a/src/ports/linux/pnal.c
+++ b/src/ports/linux/pnal.c
@@ -560,20 +560,43 @@ pnal_ipaddr_t pnal_get_netmask (const char * interface_name)
 
 pnal_ipaddr_t pnal_get_gateway (const char * interface_name)
 {
-   /* TODO Read the actual default gateway (somewhat complicated) */
+   char line[1024];
 
-   pnal_ipaddr_t ip;
-   pnal_ipaddr_t gateway;
-
-   ip = pnal_get_ip_address (interface_name);
-   if (ip == PNAL_IPADDR_INVALID)
+   // Open the route file
+   FILE* fp = fopen("/proc/net/route", "r");
+   if (fp == NULL) 
    {
       return PNAL_IPADDR_INVALID;
    }
 
-   gateway = (ip & 0xFFFFFF00) | 0x00000001;
+   // Skip the first line (header)
+   if(fgets(line, sizeof(line), fp) == NULL) 
+   {
+      fclose(fp);
+      return PNAL_IPADDR_INVALID;
+   }
 
-   return gateway;
+   // Read the route entries
+   while (fgets(line, sizeof(line), fp)) 
+   {
+      char iface[1024], dest[1024];
+      uint32_t flags, refcnt, use, metric, mask, mtu, window, irtt, gateway;
+
+      int ret = sscanf(line, "%s %s %x %x %d %d %d %x %d %d %d\n",
+                       iface, dest, &gateway, &flags, &refcnt, &use,
+                       &metric, &mask, &mtu, &window, &irtt);
+      
+      if (ret == 11) 
+      {
+         if (!strcmp(iface, interface_name) && gateway != 0)
+         {
+            fclose(fp);
+            return htonl(gateway);
+         }
+      }
+   }
+   fclose(fp);
+   return PNAL_IPADDR_INVALID;
 }
 
 int pnal_get_hostname (char * hostname)