diff --git a/binr/radiff2/radiff2.c b/binr/radiff2/radiff2.c
index 78ac0249e1..8e84bfab90 100644
--- a/binr/radiff2/radiff2.c
+++ b/binr/radiff2/radiff2.c
@@ -36,8 +36,8 @@ static int show_help(int line) {
 		"  -r     radare commands\n"
 		"  -d     use delta diffing\n"
 		"  -g     graph diff\n"
-		"  -v     Use vaddr"
-		"  -V     show version information\n");;
+		"  -v     Use vaddr\n"
+		"  -V     show version information\n");
 	return 1;
 }
 
diff --git a/libr/anal/bb.c b/libr/anal/bb.c
index 1b8cd9d509..3e35180284 100644
--- a/libr/anal/bb.c
+++ b/libr/anal/bb.c
@@ -45,10 +45,10 @@ R_API void r_anal_bb_free(void *_bb) {
 	if (bb) {
 		if (bb->cond)
 			free (bb->cond);
-		if (((RAnalBlock*)bb)->aops)
-			r_list_free (((RAnalBlock*)bb)->aops);
-		if (((RAnalBlock*)bb)->fingerprint)
-			free (((RAnalBlock*)bb)->fingerprint);
+		if (bb->aops)
+			r_list_free (bb->aops);
+		if (bb->fingerprint)
+			free (bb->fingerprint);
 		free (bb);
 	}
 }
diff --git a/libr/anal/fcn.c b/libr/anal/fcn.c
index d93c6d7627..17652a362c 100644
--- a/libr/anal/fcn.c
+++ b/libr/anal/fcn.c
@@ -27,18 +27,19 @@ R_API RList *r_anal_fcn_list_new() {
 	return list;
 }
 
-R_API void r_anal_fcn_free(void *fcn) {
+R_API void r_anal_fcn_free(void *_fcn) {
+	RAnalFcn *fcn = _fcn;
 	if (fcn) {
-		if (((RAnalFcn*)fcn)->name)
-			free (((RAnalFcn*)fcn)->name);
-		if (((RAnalFcn*)fcn)->refs)
-			r_list_free (((RAnalFcn*)fcn)->refs);
-		if (((RAnalFcn*)fcn)->xrefs)
-			r_list_free (((RAnalFcn*)fcn)->xrefs);
-		if (((RAnalFcn*)fcn)->vars)
-			r_list_free (((RAnalFcn*)fcn)->vars);
-		if (((RAnalFcn*)fcn)->fingerprint)
-			free (((RAnalFcn*)fcn)->fingerprint);
+		if (fcn->name)
+			free (fcn->name);
+		if (fcn->refs)
+			r_list_free (fcn->refs);
+		if (fcn->xrefs)
+			r_list_free (fcn->xrefs);
+		if (fcn->vars)
+			r_list_free (fcn->vars);
+		if (fcn->fingerprint)
+			free (fcn->fingerprint);
 	}
 	free (fcn);
 }
diff --git a/libr/core/gdiff.c b/libr/core/gdiff.c
index 70d63ebdbe..9114d2e860 100644
--- a/libr/core/gdiff.c
+++ b/libr/core/gdiff.c
@@ -43,8 +43,9 @@ static void gdiff_diff_bb(RAnalFcn *mfcn, RAnalFcn *mfcn2, RList *bbs, RList *bb
 	iter = r_list_iterator (bbs);
 	while (r_list_iter_next (iter)) {
 		bb = r_list_iter_get (iter);
-		if (bb->diff == R_ANAL_DIFF_NULL &&
-				bb->addr >= mfcn->addr && bb->addr < mfcn->addr + mfcn->size) {
+		if (bb->diff != R_ANAL_DIFF_NULL)
+			continue;
+		if (bb->addr >= mfcn->addr && bb->addr < mfcn->addr + mfcn->size) {
 			ot = 0;
 			mbb = mbb2 = NULL;
 			iter2 = r_list_iterator (bbs2);
@@ -55,7 +56,7 @@ static void gdiff_diff_bb(RAnalFcn *mfcn, RAnalFcn *mfcn2, RList *bbs, RList *bb
 					r_diff_buffers_distance(NULL, bb->fingerprint, bb->size,
 							bb2->fingerprint, bb2->size, &d, &t);
 #if 0 
-					printf ("BB: %llx - %llx => %i - %i - %i => %f\n", bb->addr, bb2->addr,
+					eprintf ("BB: %llx - %llx => %i - %i - %i => %f\n", bb->addr, bb2->addr,
 							bb->ninstr, bb2->ninstr, p, t);
 #endif 
 					if (t > THRESHOLDBB && t > ot) {
@@ -91,12 +92,12 @@ static void gdiff_diff_fcn(RList *fcns, RList *fcns2, RList *bbs, RList *bbs2) {
 		iter2 = r_list_iterator (fcns2);
 		while (r_list_iter_next (iter2)) {
 			fcn2 = r_list_iter_get (iter2);
-			if (fcn2->type != R_ANAL_FCN_TYPE_FCN)
+			if (fcn2->type != R_ANAL_FCN_TYPE_FCN || fcn2->diff != R_ANAL_DIFF_NULL)
 				continue;
 			r_diff_buffers_distance(NULL, fcn->fingerprint, fcn->size,
 					fcn2->fingerprint, fcn2->size, &d, &t);
-#if 0
-			printf ("FCN: %s - %s => %lli - %lli => %f\n", fcn->name, fcn2->name,
+#if 1
+			eprintf ("FCN: %s - %s => %lli - %lli => %f\n", fcn->name, fcn2->name,
 					fcn->size, fcn2->size, t);
 #endif 
 			if (t > THRESHOLDFCN && t > ot) {
@@ -107,7 +108,7 @@ static void gdiff_diff_fcn(RList *fcns, RList *fcns2, RList *bbs, RList *bbs2) {
 		}
 		if (mfcn != NULL && mfcn2 != NULL) {
 #if 0
-			printf ("Match => %s - %s\n", mfcn->name, mfcn2->name);
+			eprintf ("Match => %s - %s\n", mfcn->name, mfcn2->name);
 #endif
 			/* Set flag in matched functions */
 			if (ot == 1)
@@ -136,7 +137,7 @@ R_API int r_core_gdiff(RCore *c, const char *file1, const char *file2, int va) {
 		/* Load and analyze bin*/
 		r_config_set_i (core2->config, "io.va", va);
 		if (!r_core_file_open (core2, files[i], 0)) {
-			fprintf (stderr, "Cannot open file '%s'\n", files[i]);
+			eprintf ("Cannot open file '%s'\n", files[i]);
 			return R_FALSE;
 		}
 		r_config_set_i (core2->config, "anal.split", 0);