diff --git a/libs/openzap/msvc/openzap.vcproj b/libs/openzap/msvc/openzap.vcproj
index 33776e109c..67565dbb90 100644
--- a/libs/openzap/msvc/openzap.vcproj
+++ b/libs/openzap/msvc/openzap.vcproj
@@ -403,6 +403,10 @@
 					RelativePath="..\src\zap_buffer.c"
 					>
 				</File>
+				<File
+					RelativePath="..\src\zap_callerid.c"
+					>
+				</File>
 				<File
 					RelativePath="..\src\zap_config.c"
 					>
diff --git a/libs/openzap/src/include/zap_types.h b/libs/openzap/src/include/zap_types.h
index ef0269fb67..84f74ee556 100644
--- a/libs/openzap/src/include/zap_types.h
+++ b/libs/openzap/src/include/zap_types.h
@@ -85,11 +85,11 @@ struct zap_fsk_data_state {
 	uint8_t init;
 	uint8_t *buf;
 	size_t bufsize;
-	int blen;
-	int bpos;
-	int dlen;
-	int ppos;
-	uint8_t checksum;
+	zap_size_t blen;
+	zap_size_t bpos;
+	zap_size_t dlen;
+	zap_size_t ppos;
+	int checksum;
 };
 typedef struct zap_fsk_data_state zap_fsk_data_state_t;
 
diff --git a/libs/openzap/src/zap_callerid.c b/libs/openzap/src/zap_callerid.c
index f94ec59076..f3a685f55a 100644
--- a/libs/openzap/src/zap_callerid.c
+++ b/libs/openzap/src/zap_callerid.c
@@ -6,7 +6,7 @@
 static void fsk_byte_handler (void *x, int data)
 {
 	zap_fsk_data_state_t *state = (zap_fsk_data_state_t *) x;
-	uint8_t byte = data;
+	uint8_t byte = (uint8_t)data;
 
  top:
 
@@ -39,7 +39,8 @@ static void fsk_byte_handler (void *x, int data)
 zap_status_t zap_fsk_data_parse(zap_fsk_data_state_t *state, zap_size_t *type, char **data, zap_size_t *len)
 {
 
-	int i, sum = 0;
+	zap_size_t i;
+	int sum = 0;
 	
  top: