diff --git a/system/free/free.c b/system/free/free.c
index c44cd5e22..3132be5ed 100644
--- a/system/free/free.c
+++ b/system/free/free.c
@@ -51,9 +51,9 @@
 
 static void free_getprogmeminfo(struct mallinfo * mem)
 {
-  uint16_t page = 0, stpage = 0xFFFF;
-  uint16_t pagesize = 0;
-  int status;
+  size_t page = 0, stpage = 0xFFFF;
+  size_t pagesize = 0;
+  ssize_t status;
 
   mem->arena    = 0;
   mem->fordblks = 0;
diff --git a/system/install/install.c b/system/install/install.c
index 807744a7d..fe0c467f7 100644
--- a/system/install/install.c
+++ b/system/install/install.c
@@ -87,11 +87,11 @@ static const char *install_script_exec =
 
 static int install_getstartpage(int startpage, int pagemargin, int desiredsize)
 {
-  uint16_t page = 0, stpage = 0xffff;
-  uint16_t pagesize = 0;
+  size_t   page = 0, stpage = 0xffff;
+  size_t   pagesize = 0;
   int      maxlen = -1;
   int      maxlen_start = 0xffff;
-  int      status;
+  ssize_t  status;
 
   for (status=0, page=0; status >= 0; page++)
     {
@@ -148,11 +148,11 @@ static int install_getstartpage(int startpage, int pagemargin, int desiredsize)
 
 static int install_programflash(int startaddr, const char *source)
 {
-  int  status;
-  int  count;
-  int  totalsize = 0;
-  char *buf;
-  FILE *fp;
+  ssize_t status;
+  size_t  count;
+  ssize_t totalsize = 0;
+  char    *buf;
+  FILE    *fp;
 
   if ((buf = malloc(INSTALL_PROGRAMBLOCKSIZE)) == NULL)
     {
@@ -265,7 +265,7 @@ static int install_remove(const char *scriptname)
 {
   FILE    *fp;
   int      progsize, addr, freedsize;
-  uint16_t page;
+  ssize_t  page;
   int      status = 0;
 
   /* Parse script */