diff --git a/bgpq3.c b/bgpq3.c
index f4010f9..4194bca 100644
--- a/bgpq3.c
+++ b/bgpq3.c
@@ -440,9 +440,9 @@ main(int argc, char* argv[])
 	};
 
 	if(aggregate && expander.vendor==V_NOKIA_MD &&
-		expander.generation!=T_EACL) {
+		expander.generation!=T_PREFIXLIST) {
 		sx_report(SX_FATAL, "Sorry, aggregation (-A) is not supported with "
-			"match-lists on Nokia MD-CLI. You can try prefix-lists (-E) "
+			"match-lists (-E) on Nokia MD-CLI. You can try prefix-lists (-P) "
 			"instead\n");
 		exit(1);
 	};
diff --git a/bgpq3_printer.c b/bgpq3_printer.c
index 64089d6..23e5554 100644
--- a/bgpq3_printer.c
+++ b/bgpq3_printer.c
@@ -1405,7 +1405,7 @@ bgpq3_print_prefixlist(FILE* f, struct bgpq_expander* b)
 		case V_OPENBGPD: return bgpq3_print_openbgpd_prefixlist(f,b);
 		case V_FORMAT: return bgpq3_print_format_prefixlist(f,b);
 		case V_NOKIA: return bgpq3_print_nokia_prefixlist(f,b);
-		case V_NOKIA_MD: return bgpq3_print_nokia_md_prefixlist(f,b);
+		case V_NOKIA_MD: return bgpq3_print_nokia_md_ipprefixlist(f,b);
 		case V_HUAWEI: return bgpq3_print_huawei_prefixlist(f,b);
 	};
 	return 0;
@@ -1423,7 +1423,7 @@ bgpq3_print_eacl(FILE* f, struct bgpq_expander* b)
 		case V_OPENBGPD: return bgpq3_print_openbgpd_prefixset(f,b);
 		case V_FORMAT: sx_report(SX_FATAL, "unreachable point\n");
 		case V_NOKIA: return bgpq3_print_nokia_ipprefixlist(f,b);
-		case V_NOKIA_MD: return bgpq3_print_nokia_md_ipprefixlist(f,b);
+		case V_NOKIA_MD: return bgpq3_print_nokia_md_prefixlist(f,b);
 		case V_HUAWEI: return sx_report(SX_FATAL, "unreachable point\n");
 	};
 	return 0;