diff -Nru gammu-1.11.0.orig/common/phone/at/atgen.c gammu-1.11.0/common/phone/at/atgen.c
--- gammu-1.11.0.orig/common/phone/at/atgen.c	2007-05-11 11:14:47.000000000 +0300
+++ gammu-1.11.0/common/phone/at/atgen.c	2007-05-15 19:37:00.000000000 +0300
@@ -642,7 +642,7 @@
 		if (GetLineLength(msg.Buffer, Priv->Lines, 2) <= MAX_MANUFACTURER_LENGTH) {
 			CopyLineString(s->Phone.Data.Manufacturer, msg.Buffer, Priv->Lines, 2);
 		} else {
-			smprintf(s, "WARNING: Manufacturer name too long, increase MAX_MANUFACTURER_LENGTH to at least %zd\n", GetLineLength(msg.Buffer, Priv->Lines, 2));
+			smprintf(s, "WARNING: Manufacturer name too long, increase MAX_MANUFACTURER_LENGTH to at least %d\n", GetLineLength(msg.Buffer, Priv->Lines, 2));
 			s->Phone.Data.Manufacturer[0] = 0;
 		}
 		/* Sometimes phone adds this before manufacturer (Sagem) */
diff -Nru gammu-1.11.0.orig/common/service/gsmcal.c gammu-1.11.0/common/service/gsmcal.c
--- gammu-1.11.0.orig/common/service/gsmcal.c	2007-05-03 12:55:44.000000000 +0300
+++ gammu-1.11.0/common/service/gsmcal.c	2007-05-15 19:39:36.000000000 +0300
@@ -677,11 +677,11 @@
 					if (Version == Mozilla_iCalendar) {
 						if (!header) {
 							*Length += sprintf(Buffer + (*Length), ";BYDAY=%s",
-								DaysOfWeek[note->Entries[j].Number]);
+								DaysOfWeek[note->Entries[i].Number]);
 							header = true;
 						} else {
 							*Length += sprintf(Buffer + (*Length), ",%s",
-								DaysOfWeek[note->Entries[j].Number]);
+								DaysOfWeek[note->Entries[i].Number]);
 						}
 					} else {
 						*Length += sprintf(Buffer + (*Length), " %s",