diff --git a/lib/isc/task.c b/lib/isc/task.c
index 0ea4487b0f..b90e3a949a 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -37,7 +37,7 @@
 	ISC_R_SUCCESS);
 
 #ifdef ISC_TASK_TRACE
-#define XTRACE(m)		printf("%s task %p thread %p\n", (m), \
+#define XTRACE(m)		printf("%s task %p thread %lu\n", (m), \
 				       task, isc_thread_self())
 #else
 #define XTRACE(m)
@@ -434,8 +434,8 @@ isc_task_destroy(isc_task_t *taskp) {
  *** Task Manager.
  ***/
 
-static
-void *run(void *uap) {
+static isc_threadresult_t
+run(void *uap) {
 	isc_taskmgr_t manager = uap;
 	isc_task_t task;
 	isc_boolean_t no_workers = ISC_FALSE;
@@ -676,7 +676,7 @@ void *run(void *uap) {
 
 	XTRACE("exit");
 
-	return (NULL);	
+	return ((isc_threadresult_t)0);
 }
 
 static void
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 575c8da453..49abefd33a 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -488,7 +488,7 @@ dispatch(isc_timermgr_t manager, isc_time_t now) {
 	} 
 }
 
-static void *
+static isc_threadresult_t
 run(void *uap) {
 	isc_timermgr_t manager = uap;
 	struct isc_time now;
@@ -516,7 +516,7 @@ run(void *uap) {
 	}
 	UNLOCK(&manager->lock);
 
-	return (NULL);
+	return ((isc_threadresult_t)0);
 }
 
 static isc_boolean_t
@@ -628,7 +628,7 @@ isc_timermgr_destroy(isc_timermgr_t *managerp) {
 	/*
 	 * Wait for thread to exit.
 	 */
-	if (isc_thread_join(manager->thread) != ISC_R_SUCCESS)
+	if (isc_thread_join(manager->thread, NULL) != ISC_R_SUCCESS)
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
 				 "isc_thread_join() failed");