diff --git a/src/isi-call.c b/src/isi-call.c
index 93ad5e3..3e289a8 100644
--- a/src/isi-call.c
+++ b/src/isi-call.c
@@ -287,7 +287,7 @@ void proto_reg_handoff_isi_call(void) {
 
 	if (!initialized) {
 		isi_call_handle = create_dissector_handle(dissect_isi_call, proto_isi);
-		dissector_add("isi.resource", 0x01, isi_call_handle);
+		dissector_add_uint("isi.resource", 0x01, isi_call_handle);
 	}
 }
 
diff --git a/src/isi-commgr.c b/src/isi-commgr.c
index f36e62c..ef7cd92 100644
--- a/src/isi-commgr.c
+++ b/src/isi-commgr.c
@@ -49,7 +49,7 @@ void proto_reg_handoff_isi_commgr(void) {
 
 	if (!initialized) {
 		isi_commgr_handle = create_dissector_handle(dissect_isi_commgr, proto_isi);
-		dissector_add("isi.resource", 0x10, isi_commgr_handle);
+		dissector_add_uint("isi.resource", 0x10, isi_commgr_handle);
 	}
 }
 
diff --git a/src/isi-gpds.c b/src/isi-gpds.c
index 7d6e758..02e7400 100644
--- a/src/isi-gpds.c
+++ b/src/isi-gpds.c
@@ -556,7 +556,7 @@ void proto_reg_handoff_isi_gpds(void) {
 
 	if (!initialized) {
 		isi_gpds_handle = create_dissector_handle(dissect_isi_gpds, proto_isi);
-		dissector_add("isi.resource", 0x31, isi_gpds_handle);
+		dissector_add_uint("isi.resource", 0x31, isi_gpds_handle);
 	}
 }
 
diff --git a/src/isi-gps.c b/src/isi-gps.c
index 8a2c8aa..188fb74 100644
--- a/src/isi-gps.c
+++ b/src/isi-gps.c
@@ -109,7 +109,7 @@ void proto_reg_handoff_isi_gps(void) {
 
 	if (!initialized) {
 		isi_gps_handle = create_dissector_handle(dissect_isi_gps, proto_isi);
-		dissector_add("isi.resource", 0x54, isi_gps_handle);
+		dissector_add_uint("isi.resource", 0x54, isi_gps_handle);
 	}
 }
 
diff --git a/src/isi-gss.c b/src/isi-gss.c
index edcfbe5..9e977bf 100644
--- a/src/isi-gss.c
+++ b/src/isi-gss.c
@@ -71,7 +71,7 @@ void proto_reg_handoff_isi_gss(void) {
 
 	if (!initialized) {
 		isi_gss_handle = create_dissector_handle(dissect_isi_gss, proto_isi);
-		dissector_add("isi.resource", 0x32, isi_gss_handle);
+		dissector_add_uint("isi.resource", 0x32, isi_gss_handle);
 	}
 }
 
diff --git a/src/isi-light.c b/src/isi-light.c
index 0931e45..5b0f16e 100644
--- a/src/isi-light.c
+++ b/src/isi-light.c
@@ -101,7 +101,7 @@ void proto_reg_handoff_isi_light(void) {
 
 	if (!initialized) {
 		isi_light_handle = create_dissector_handle(dissect_isi_light, proto_isi);
-		dissector_add("isi.resource", 0x3A, isi_light_handle);
+		dissector_add_uint("isi.resource", 0x3A, isi_light_handle);
 	}
 }
 
diff --git a/src/isi-mtc.c b/src/isi-mtc.c
index 1d79d18..abaefee 100644
--- a/src/isi-mtc.c
+++ b/src/isi-mtc.c
@@ -229,7 +229,7 @@ void proto_reg_handoff_isi_mtc(void) {
 
 	if (!initialized) {
 		isi_mtc_handle = create_dissector_handle(dissect_isi_mtc, proto_isi);
-		dissector_add("isi.resource", 0x15, isi_mtc_handle);
+		dissector_add_uint("isi.resource", 0x15, isi_mtc_handle);
 	}
 }
 
diff --git a/src/isi-nameservice.c b/src/isi-nameservice.c
index f877640..7a9b6ec 100644
--- a/src/isi-nameservice.c
+++ b/src/isi-nameservice.c
@@ -66,7 +66,7 @@ void proto_reg_handoff_isi_nameservice(void) {
 
 	if(!initialized) {
 		isi_nameservice_handle = create_dissector_handle(dissect_isi_nameservice, proto_isi);
-		dissector_add("isi.resource", 0xdb, isi_nameservice_handle);
+		dissector_add_uint("isi.resource", 0xdb, isi_nameservice_handle);
 	}
 }
 
diff --git a/src/isi-network.c b/src/isi-network.c
index a078b2c..579d097 100644
--- a/src/isi-network.c
+++ b/src/isi-network.c
@@ -343,7 +343,7 @@ void proto_reg_handoff_isi_network(void) {
 
 	if (!initialized) {
 		isi_network_handle = create_dissector_handle(dissect_isi_network, proto_isi);
-		dissector_add("isi.resource", 0x0a, isi_network_handle);
+		dissector_add_uint("isi.resource", 0x0a, isi_network_handle);
 	}
 }
 
diff --git a/src/isi-phoneinfo.c b/src/isi-phoneinfo.c
index b8e8df6..30271f2 100644
--- a/src/isi-phoneinfo.c
+++ b/src/isi-phoneinfo.c
@@ -271,7 +271,7 @@ void proto_reg_handoff_isi_phoneinfo(void) {
 
 	if (!initialized) {
 		isi_phoneinfo_handle = create_dissector_handle(dissect_isi_phoneinfo, proto_isi);
-		dissector_add("isi.resource", 0x1b, isi_phoneinfo_handle);
+		dissector_add_uint("isi.resource", 0x1b, isi_phoneinfo_handle);
 	}
 }
 
diff --git a/src/isi-pipe.c b/src/isi-pipe.c
index bbdb917..bd85215 100644
--- a/src/isi-pipe.c
+++ b/src/isi-pipe.c
@@ -162,7 +162,7 @@ void proto_reg_handoff_isi_pipe(void) {
 
 	if (!initialized) {
 		isi_pipe_handle = create_dissector_handle(dissect_isi_pipe, proto_isi);
-		dissector_add("isi.resource", 0xd9, isi_pipe_handle);
+		dissector_add_uint("isi.resource", 0xd9, isi_pipe_handle);
 	}
 }
 
diff --git a/src/isi-radiosettings.c b/src/isi-radiosettings.c
index 00b42db..4701a3a 100644
--- a/src/isi-radiosettings.c
+++ b/src/isi-radiosettings.c
@@ -43,7 +43,7 @@ void proto_reg_handoff_isi_radiosettings(void) {
 
 	if(!initialized) {
 		isi_radiosettings_handle = create_dissector_handle(dissect_isi_radiosettings, proto_isi);
-		dissector_add("isi.resource", 0xB4, isi_radiosettings_handle);
+		dissector_add_uint("isi.resource", 0xB4, isi_radiosettings_handle);
 	}
 }
 
diff --git a/src/isi-selftest.c b/src/isi-selftest.c
index 2adc528..1905054 100644
--- a/src/isi-selftest.c
+++ b/src/isi-selftest.c
@@ -259,7 +259,7 @@ void proto_reg_handoff_isi_selftest(void) {
 
 	if (!initialized) {
 		isi_selftest_handle = create_dissector_handle(dissect_isi_selftest, proto_isi);
-		dissector_add("isi.resource", 0x35, isi_selftest_handle);
+		dissector_add_uint("isi.resource", 0x35, isi_selftest_handle);
 	}
 }
 
diff --git a/src/isi-sim.c b/src/isi-sim.c
index 086704a..ccbda76 100644
--- a/src/isi-sim.c
+++ b/src/isi-sim.c
@@ -194,7 +194,7 @@ void proto_reg_handoff_isi_sim(void) {
 
 	if (!initialized) {
 		isi_sim_handle = create_dissector_handle(dissect_isi_sim, proto_isi);
-		dissector_add("isi.resource", 0x09, isi_sim_handle);
+		dissector_add_uint("isi.resource", 0x09, isi_sim_handle);
 	}
 }
 
diff --git a/src/isi-simauth.c b/src/isi-simauth.c
index bd3eb3f..64e87c4 100644
--- a/src/isi-simauth.c
+++ b/src/isi-simauth.c
@@ -98,7 +98,7 @@ void proto_reg_handoff_isi_sim_auth(void) {
 
 	if (!initialized) {
 		isi_sim_auth_handle = create_dissector_handle(dissect_isi_sim_auth, proto_isi);
-		dissector_add("isi.resource", 0x08, isi_sim_auth_handle);
+		dissector_add_uint("isi.resource", 0x08, isi_sim_auth_handle);
 	}
 }
 
diff --git a/src/isi-sms.c b/src/isi-sms.c
index f147025..b382cbc 100644
--- a/src/isi-sms.c
+++ b/src/isi-sms.c
@@ -157,7 +157,7 @@ void proto_reg_handoff_isi_sms(void) {
 
 	if (!initialized) {
 		isi_sms_handle = create_dissector_handle(dissect_isi_sms, proto_isi);
-		dissector_add("isi.resource", 0x02, isi_sms_handle);
+		dissector_add_uint("isi.resource", 0x02, isi_sms_handle);
 	}
 }
 
diff --git a/src/isi-ss.c b/src/isi-ss.c
index f37626f..c98f031 100644
--- a/src/isi-ss.c
+++ b/src/isi-ss.c
@@ -122,7 +122,7 @@ void proto_reg_handoff_isi_ss(void) {
 
 	if (!initialized) {
 		isi_ss_handle = create_dissector_handle(dissect_isi_ss, proto_isi);
-		dissector_add("isi.resource", 0x06, isi_ss_handle);
+		dissector_add_uint("isi.resource", 0x06, isi_ss_handle);
 	}
 }
 
diff --git a/src/packet-isi.c b/src/packet-isi.c
index 0868f83..e86b429 100644
--- a/src/packet-isi.c
+++ b/src/packet-isi.c
@@ -352,7 +352,7 @@ void proto_reg_handoff_isi(void) {
 	if(!initialized) {
 		data_handle = find_dissector("data");
 		isi_handle = create_dissector_handle(dissect_isi, proto_isi);
-		dissector_add("sll.ltype", ISI_LTYPE, isi_handle);
+		dissector_add_uint("sll.ltype", ISI_LTYPE, isi_handle);
 
 		/* handoff resource dissectors */
 		proto_reg_handoff_isi_sim_auth();
@@ -374,7 +374,7 @@ void proto_reg_handoff_isi(void) {
 		proto_reg_handoff_isi_selftest();
 
 #ifdef ISI_USB
-		heur_dissector_add("usb.bulk", dissect_usb_isi, proto_isi);
+		heur_dissector_add_uint("usb.bulk", dissect_usb_isi, proto_isi);
 #endif
 	}
 }
@@ -531,7 +531,7 @@ static void dissect_isi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 		content = tvb_new_subset(tvb, 8, length, length);
 
 		/* Call subdissector depending on the resource ID */
-		if(!dissector_try_port(isi_resource_dissector_table, resource, content, pinfo, isi_tree))
+		if(!dissector_try_uint(isi_resource_dissector_table, resource, content, pinfo, isi_tree))
 			call_dissector(data_handle, content, pinfo, isi_tree);
 	}
 }