diff --git a/src/iphoneinstaller.c b/src/iphoneinstaller.c
index d3e311c..8787a24 100644
--- a/src/iphoneinstaller.c
+++ b/src/iphoneinstaller.c
@@ -297,7 +297,6 @@
 			break;
 		case 'D':
 			iphone_set_debug_level(1);
-			iphone_set_debug_mask(DBGMASK_ALL);
 			break;
 		default:
 			print_usage(argc, argv);
@@ -318,7 +317,7 @@
 	instproxy_client_t ipc = NULL;
 	np_client_t np = NULL;
 	afc_client_t afc = NULL;
-	int port = 0;
+	uint16_t port = 0;
 	int res = 0;
 
 	parse_opts(argc, argv);
@@ -331,7 +330,7 @@
 		return -1;
 	}
 
-	if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
+	if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(phone, &client, "iphoneinstaller")) {
 		fprintf(stderr, "Could not connect to lockdownd. Exiting.\n");
 		goto leave_cleanup;
 	}
@@ -923,7 +922,7 @@
 				remove_archive_mode = 1;
 				free(options);
 				options = NULL;
-				if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) {
+				if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(phone, &client, "iphoneinstaller")) {
 					fprintf(stderr, "Could not connect to lockdownd. Exiting.\n");
 					goto leave_cleanup;
 				}