diff --git a/apps/calc/calc.c b/apps/calc/calc.c
index 8f8fa50f1..329ee3338 100644
--- a/apps/calc/calc.c
+++ b/apps/calc/calc.c
@@ -29,7 +29,7 @@
  *
  * This an example program for the Contiki desktop OS
  *
- * $Id: calc.c,v 1.1 2006/06/17 22:41:10 adamdunkels Exp $
+ * $Id: calc.c,v 1.2 2006/08/16 22:11:16 oliverschmidt Exp $
  *
  */
 
@@ -138,11 +138,11 @@ operand2_to_input(void)
 {
   unsigned char i;
   
-  input[7] = (operand2/10000) % 10 + '0';
-  input[8] = (operand2/1000) % 10 + '0';
-  input[9] = (operand2/100) % 10 + '0';
-  input[10] = (operand2/10) % 10 + '0';
-  input[11] = operand2 % 10 + '0';
+  input[7] = (char)((operand2/10000) % 10) + '0';
+  input[8] = (char)((operand2/1000) % 10) + '0';
+  input[9] = (char)((operand2/100) % 10) + '0';
+  input[10] = (char)((operand2/10) % 10) + '0';
+  input[11] = (char)(operand2 % 10) + '0';
 
   for(i = 0; i < 4; ++i) {
     if(input[7 + i] == '0') {
diff --git a/apps/webserver/httpd.c b/apps/webserver/httpd.c
index a90593742..34d4e8692 100644
--- a/apps/webserver/httpd.c
+++ b/apps/webserver/httpd.c
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: httpd.c,v 1.2 2006/08/09 16:13:39 bg- Exp $
+ * $Id: httpd.c,v 1.3 2006/08/16 22:09:51 oliverschmidt Exp $
  */
 
 #include "contiki-net.h"
@@ -44,7 +44,7 @@
 #define STATE_WAITING 0
 #define STATE_OUTPUT  1
 
-#define SEND_STRING(s, str) PSOCK_SEND(s, str, strlen(str))
+#define SEND_STRING(s, str) PSOCK_SEND(s, str, (unsigned int)strlen(str))
 MEMB(conns, struct httpd_state, 8);
 
 #define ISO_nl      0x0a