diff --git a/src/libopensc/muscle-filesystem.c b/src/libopensc/muscle-filesystem.c
index 6f3d5f10..4ae4efae 100644
--- a/src/libopensc/muscle-filesystem.c
+++ b/src/libopensc/muscle-filesystem.c
@@ -193,7 +193,7 @@ int mscfs_check_selection(mscfs_t *fs, int requiredItem)
 	return 0;
 }
 
-int mscfs_loadFileInfo(mscfs_t* fs, const u8 *path, int pathlen, mscfs_file_t **file_data, int* index)
+int mscfs_loadFileInfo(mscfs_t* fs, const u8 *path, int pathlen, mscfs_file_t **file_data, int* idx)
 {
 	u8 fullPath[4];
 	int x;
@@ -202,13 +202,13 @@ int mscfs_loadFileInfo(mscfs_t* fs, const u8 *path, int pathlen, mscfs_file_t **
 	
 	/* Obtain file information while checking if it exists */
 	mscfs_check_cache(fs);
-	if(index) *index = -1;
+	if(idx) *idx = -1;
 	for(x = 0; x < fs->cache.size; x++) {
 		u8 *objectId;
 		*file_data = &fs->cache.array[x];
 		objectId = (*file_data)->objectId;
 		if(0 == memcmp(objectId, fullPath, 4)) {
-			if(index) *index = x;
+			if(idx) *idx = x;
 			break;
 		}
 		*file_data = NULL;
@@ -228,7 +228,7 @@ int mscfs_loadFileInfo(mscfs_t* fs, const u8 *path, int pathlen, mscfs_file_t **
 		ROOT_FILE.delete = 0x02;
 		
 		*file_data = &ROOT_FILE;
-		if(index) *index = -2;
+		if(idx) *idx = -2;
 	} else if(*file_data == NULL) {
 		return MSCFS_FILE_NOT_FOUND;
 	}
diff --git a/src/libopensc/muscle.c b/src/libopensc/muscle.c
index f1bb78fe..0435d5f9 100644
--- a/src/libopensc/muscle.c
+++ b/src/libopensc/muscle.c
@@ -150,7 +150,7 @@ int msc_partial_read_object(sc_card_t *card, unsigned int le_objectId, int offse
 int msc_read_object(sc_card_t *card, unsigned int objectId, int offset, u8 *data, size_t dataLength)
 {
 	int r;
-	int i;
+	size_t i;
 	for(i = 0; i < dataLength; i += MSC_MAX_WRITE_UNIT) {
 		r = msc_partial_read_object(card, objectId, offset + i, data + i, MIN(dataLength - i, MSC_MAX_WRITE_UNIT));
 		SC_TEST_RET(card->ctx, r, "Error in partial object read");
@@ -161,7 +161,7 @@ int msc_read_object(sc_card_t *card, unsigned int objectId, int offset, u8 *data
 int msc_zero_object(sc_card_t *card, unsigned int objectId, size_t dataLength)
 {
 	u8 zeroBuffer[MSC_MAX_WRITE_UNIT];
-	int i;
+	size_t i;
 	memset(zeroBuffer, 0, MSC_MAX_WRITE_UNIT);
 	for(i = 0; i < dataLength; i += MSC_MAX_WRITE_UNIT) {
 		int r = msc_partial_update_object(card, objectId, i, zeroBuffer, MIN(dataLength - i, MSC_MAX_WRITE_UNIT));
@@ -258,7 +258,8 @@ int msc_partial_update_object(sc_card_t *card, unsigned int le_objectId, int off
 
 int msc_update_object(sc_card_t *card, unsigned int objectId, int offset, const u8 *data, size_t dataLength)
 {
-	int r, i;
+	int r;
+	size_t i;
 	for(i = 0; i < dataLength; i += MSC_MAX_READ_UNIT) {
 		r = msc_partial_update_object(card, objectId, offset + i, data + i, MIN(dataLength - i, MSC_MAX_READ_UNIT));
 		SC_TEST_RET(card->ctx, r, "Error in partial object update");