diff --git a/dhcpctl/remote.c b/dhcpctl/remote.c
index 7a444552..194c7820 100644
--- a/dhcpctl/remote.c
+++ b/dhcpctl/remote.c
@@ -186,13 +186,18 @@ isc_result_t dhcpctl_remote_set_value (omapi_object_t *h,
 				       omapi_typed_data_t *value)
 {
 	dhcpctl_remote_object_t *ro;
+	unsigned long rh;
+	isc_result_t status;
+
 	if (h -> type != dhcpctl_remote_type)
 		return ISC_R_INVALIDARG;
 	ro = (dhcpctl_remote_object_t *)h;
 
 	if (!omapi_ds_strcmp (name, "remote-handle")) {
-		return omapi_get_int_value (&ro -> remote_handle,
-					    value);
+		status = omapi_get_int_value (&rh, value);
+		if (status == ISC_R_SUCCESS)
+			ro -> remote_handle = rh;
+		return status;
 	}
 
 	if (h -> inner && h -> inner -> type -> set_value)
diff --git a/omapip/message.c b/omapip/message.c
index d4c9d569..5e51a204 100644
--- a/omapip/message.c
+++ b/omapip/message.c
@@ -364,7 +364,8 @@ isc_result_t omapi_message_process (omapi_object_t *mo, omapi_object_t *po)
 	omapi_message_object_t *message, *m;
 	omapi_object_t *object = (omapi_object_t *)0;
 	omapi_value_t *tv = (omapi_value_t *)0;
-	u_int32_t create, update, exclusive;
+	unsigned long create, update, exclusive;
+	unsigned long wsi;
 	isc_result_t status, waitstatus;
 	omapi_object_type_t *type;
 
@@ -625,8 +626,8 @@ isc_result_t omapi_message_process (omapi_object_t *mo, omapi_object_t *po)
 					      (omapi_object_t *)0,
 					      "result", &tv);
 		if (status == ISC_R_SUCCESS) {
-			status = omapi_get_int_value ((u_int32_t *)&waitstatus,
-						      tv -> value);
+			status = omapi_get_int_value (&wsi, tv -> value);
+			waitstatus = wsi;
 			omapi_value_dereference (&tv,
 						 "omapi_message_process");
 			if (status != ISC_R_SUCCESS)