diff --git a/examples/reefnet_sensuspro_test.c b/examples/reefnet_sensuspro_test.c
index b6c045c..72d8dbb 100644
--- a/examples/reefnet_sensuspro_test.c
+++ b/examples/reefnet_sensuspro_test.c
@@ -37,7 +37,7 @@ int test_dump_memory (const char* name, const char* filename)
 
 	message ("device_download\n");
 	rc = device_download (device, data, sizeof (data));
-	if (rc != DEVICE_STATUS_SUCCESS) {
+	if (rc < 0) {
 		WARNING ("Cannot read memory.");
 		device_close (device);
 		return rc;
@@ -46,7 +46,7 @@ int test_dump_memory (const char* name, const char* filename)
 	message ("Dumping data\n");
 	FILE* fp = fopen (filename, "wb");
 	if (fp != NULL) {
-		fwrite (data, sizeof (unsigned char), sizeof (data), fp);
+		fwrite (data, sizeof (unsigned char), rc, fp);
 		fclose (fp);
 	}
 
diff --git a/examples/reefnet_sensusultra_test.c b/examples/reefnet_sensusultra_test.c
index 96cf15d..463dbc1 100644
--- a/examples/reefnet_sensusultra_test.c
+++ b/examples/reefnet_sensusultra_test.c
@@ -82,7 +82,7 @@ int test_dump_memory_data (const char* name, const char* filename)
 
 	message ("device_download\n");
 	rc = device_download (device, data, sizeof (data));
-	if (rc != DEVICE_STATUS_SUCCESS) {
+	if (rc < 0) {
 		WARNING ("Cannot read memory.");
 		device_close (device);
 		return rc;
@@ -91,7 +91,7 @@ int test_dump_memory_data (const char* name, const char* filename)
 	message ("Dumping data\n");
 	FILE* fp = fopen (filename, "wb");
 	if (fp != NULL) {
-		fwrite (data, sizeof (unsigned char), sizeof (data), fp);
+		fwrite (data, sizeof (unsigned char), rc, fp);
 		fclose (fp);
 	}
 
diff --git a/examples/suunto_eon_test.c b/examples/suunto_eon_test.c
index 56b8183..6631424 100644
--- a/examples/suunto_eon_test.c
+++ b/examples/suunto_eon_test.c
@@ -22,7 +22,7 @@ int test_dump_memory (const char* name, const char* filename)
 
 	message ("device_download\n");
 	rc = device_download (device, data, sizeof (data));
-	if (rc != DEVICE_STATUS_SUCCESS) {
+	if (rc < 0) {
 		WARNING ("Cannot read memory.");
 		device_close (device);
 		return rc;
@@ -31,7 +31,7 @@ int test_dump_memory (const char* name, const char* filename)
 	message ("Dumping data\n");
 	FILE* fp = fopen (filename, "wb");
 	if (fp != NULL) {
-		fwrite (data, sizeof (unsigned char), sizeof (data), fp);
+		fwrite (data, sizeof (unsigned char), rc, fp);
 		fclose (fp);
 	}
 
diff --git a/examples/uwatec_aladin_test.c b/examples/uwatec_aladin_test.c
index 14fcbf1..1c0de0b 100644
--- a/examples/uwatec_aladin_test.c
+++ b/examples/uwatec_aladin_test.c
@@ -23,7 +23,7 @@ int test_dump_memory (const char* name, const char* filename)
 
 	message ("device_download\n");
 	rc = device_download (device, data, sizeof (data));
-	if (rc != DEVICE_STATUS_SUCCESS) {
+	if (rc < 0) {
 		WARNING ("Cannot read memory.");
 		device_close (device);
 		return rc;
@@ -32,7 +32,7 @@ int test_dump_memory (const char* name, const char* filename)
 	message ("Dumping data\n");
 	FILE* fp = fopen (filename, "wb");
 	if (fp != NULL) {
-		fwrite (data, sizeof (unsigned char), sizeof (data), fp);
+		fwrite (data, sizeof (unsigned char), rc, fp);
 		fclose (fp);
 	}
 
diff --git a/src/reefnet_sensuspro.c b/src/reefnet_sensuspro.c
index 29c2c3c..9ede062 100644
--- a/src/reefnet_sensuspro.c
+++ b/src/reefnet_sensuspro.c
@@ -260,7 +260,7 @@ reefnet_sensuspro_device_download (device_t *abstract, unsigned char *data, unsi
 		return DEVICE_STATUS_MEMORY;
 	}
 
-	return DEVICE_STATUS_SUCCESS;
+	return REEFNET_SENSUSPRO_MEMORY_SIZE;
 }
 
 
diff --git a/src/reefnet_sensusultra.c b/src/reefnet_sensusultra.c
index c374e97..4691f0d 100644
--- a/src/reefnet_sensusultra.c
+++ b/src/reefnet_sensusultra.c
@@ -402,7 +402,7 @@ reefnet_sensusultra_device_download (device_t *abstract, unsigned char *data, un
 		npages++;
 	}
 
-	return DEVICE_STATUS_SUCCESS;
+	return REEFNET_SENSUSULTRA_MEMORY_DATA_SIZE;
 }
 
 
diff --git a/src/suunto_eon.c b/src/suunto_eon.c
index 2e55c46..3e33990 100644
--- a/src/suunto_eon.c
+++ b/src/suunto_eon.c
@@ -164,7 +164,7 @@ suunto_eon_device_download (device_t *abstract, unsigned char data[], unsigned i
 		return DEVICE_STATUS_MEMORY;
 	}
 
-	return DEVICE_STATUS_SUCCESS;
+	return SUUNTO_EON_MEMORY_SIZE;
 }
 
 
diff --git a/src/uwatec_aladin.c b/src/uwatec_aladin.c
index b0a04da..09a9e28 100644
--- a/src/uwatec_aladin.c
+++ b/src/uwatec_aladin.c
@@ -208,7 +208,7 @@ uwatec_aladin_device_download (device_t *abstract, unsigned char data[], unsigne
 		return DEVICE_STATUS_MEMORY;
 	}
 
-	return DEVICE_STATUS_SUCCESS;
+	return UWATEC_ALADIN_MEMORY_SIZE;
 }