diff --git a/arch b/arch
index d4d2f2f588a..0d52e827d46 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit d4d2f2f588ab859dd6b1a73aa41187344f442c20
+Subproject commit 0d52e827d460d28409934e0a488266f9e036a46f
diff --git a/drivers/rwbuffer.c b/drivers/rwbuffer.c
index 9cd2a6d60d1..46d6fbefda0 100644
--- a/drivers/rwbuffer.c
+++ b/drivers/rwbuffer.c
@@ -747,10 +747,10 @@ void rwb_uninitialize(FAR struct rwbuffer_s *rwb)
  * Name: rwb_read
  ****************************************************************************/
 
-int rwb_read(FAR struct rwbuffer_s *rwb, off_t startblock, uint32_t nblocks,
-             FAR uint8_t *rdbuffer)
+ssize_t rwb_read(FAR struct rwbuffer_s *rwb, off_t startblock,
+                 size_t nblocks, FAR uint8_t *rdbuffer)
 {
-  uint32_t remaining;
+  size_t remaining;
   int ret = OK;
 
   fvdbg("startblock=%ld nblocks=%ld rdbuffer=%p\n",
@@ -822,7 +822,7 @@ int rwb_read(FAR struct rwbuffer_s *rwb, off_t startblock, uint32_t nblocks,
               if (ret < 0)
                 {
                   fdbg("ERROR: Failed to fill the read-ahead buffer: %d\n", ret);
-                  return ret;
+                  return (ssize_t)ret;
                 }
             }
         }
@@ -846,15 +846,15 @@ int rwb_read(FAR struct rwbuffer_s *rwb, off_t startblock, uint32_t nblocks,
     }
 #endif
 
-  return ret;
+  return (ssize_t)ret;
 }
 
 /****************************************************************************
  * Name: rwb_write
  ****************************************************************************/
 
-int rwb_write(FAR struct rwbuffer_s *rwb, off_t startblock,
-              size_t nblocks, FAR const uint8_t *wrbuffer)
+ssize_t rwb_write(FAR struct rwbuffer_s *rwb, off_t startblock,
+                  size_t nblocks, FAR const uint8_t *wrbuffer)
 {
   int ret = OK;
 
@@ -917,10 +917,9 @@ int rwb_write(FAR struct rwbuffer_s *rwb, off_t startblock,
 
       ret = rwb->wrflush(rwb->dev, wrbuffer, startblock, nblocks);
     }
-
 #endif
 
-  return ret;
+  return (ssize_t)ret;
 }
 
 /****************************************************************************
diff --git a/net/arp/arp_timer.c b/net/arp/arp_timer.c
index b610e7b8a5e..cec202ae413 100644
--- a/net/arp/arp_timer.c
+++ b/net/arp/arp_timer.c
@@ -88,7 +88,7 @@ static WDOG_ID g_arptimer;           /* ARP timer */
  *
  ****************************************************************************/
 
-static void arptimer_poll(int argc, uint32_t arg, ...)
+static void arptimer_poll(int argc, wdparm_t arg, ...)
 {
   /* Call the ARP timer function every 10 seconds. */