diff --git a/ompi/mpi/tool/cvar_read.c b/ompi/mpi/tool/cvar_read.c
index 2b7e839fd5..843ca493f8 100644
--- a/ompi/mpi/tool/cvar_read.c
+++ b/ompi/mpi/tool/cvar_read.c
@@ -56,7 +56,7 @@ int MPI_T_cvar_read (MPI_T_cvar_handle handle, void *buf)
             ((unsigned long long *) buf)[0] = value->ullval;
             break;
         case MCA_BASE_VAR_TYPE_SIZE_T:
-            ((int *) buf)[0] = value->sizetval;
+            ((size_t *) buf)[0] = value->sizetval;
             break;
         case MCA_BASE_VAR_TYPE_BOOL:
             ((int *) buf)[0] = value->boolval;
diff --git a/opal/datatype/opal_copy_functions_heterogeneous.c b/opal/datatype/opal_copy_functions_heterogeneous.c
index 8ff6d1644d..956a1d46bc 100644
--- a/opal/datatype/opal_copy_functions_heterogeneous.c
+++ b/opal/datatype/opal_copy_functions_heterogeneous.c
@@ -330,7 +330,7 @@ COPY_TYPE_HETEROGENEOUS( float12, long double )
 
 #if SIZEOF_FLOAT == 16
 COPY_TYPE_HETEROGENEOUS( float16, float )
-#elif SIZEOF_DOUBLE == 8
+#elif SIZEOF_DOUBLE == 16
 COPY_TYPE_HETEROGENEOUS( float16, double )
 #elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 16
 COPY_TYPE_HETEROGENEOUS( float16, long double )
diff --git a/opal/threads/condition.h b/opal/threads/condition.h
index cb510cf85a..4c61fd64ac 100644
--- a/opal/threads/condition.h
+++ b/opal/threads/condition.h
@@ -94,7 +94,7 @@ static inline int opal_condition_timedwait(opal_condition_t *c,
     c->c_waiting++;
     if (opal_using_threads()) {
         absolute.tv_sec = abstime->tv_sec;
-        absolute.tv_usec = abstime->tv_nsec * 1000;
+        absolute.tv_usec = abstime->tv_nsec / 1000;
         gettimeofday(&tv,NULL);
         if (c->c_signaled == 0) {
             do {
@@ -108,7 +108,7 @@ static inline int opal_condition_timedwait(opal_condition_t *c,
         }
     } else {
         absolute.tv_sec = abstime->tv_sec;
-        absolute.tv_usec = abstime->tv_nsec * 1000;
+        absolute.tv_usec = abstime->tv_nsec / 1000;
         gettimeofday(&tv,NULL);
         if (c->c_signaled == 0) {
             do {
diff --git a/opal/util/Makefile.am b/opal/util/Makefile.am
index cedf860bf7..f80cbd50ec 100644
--- a/opal/util/Makefile.am
+++ b/opal/util/Makefile.am
@@ -42,9 +42,8 @@ headers = \
         crc.h \
         daemon_init.h \
         error.h \
-        few.h \
         fd.h \
-        fd.c \
+        few.h \
         if.h \
         keyval_parse.h \
         malloc.h \
@@ -78,6 +77,7 @@ libopalutil_la_SOURCES = \
         crc.c \
         daemon_init.c \
         error.c \
+        fd.c \
         few.c \
         if.c \
         keyval_parse.c \