diff --git a/loc_api/libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c b/loc_api/libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c
index dffcad06..5d9a449e 100644
--- a/loc_api/libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c
+++ b/loc_api/libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c
@@ -110,8 +110,10 @@ SIDE EFFECTS
 int loc_eng_dmn_conn_glue_piperemove(const char * pipe_name, int fd)
 {
     close(fd);
-    if (pipe_name) unlink(pipe_name);
-    LOC_LOGD("fd = %d, %s\n", fd, pipe_name);
+    if (pipe_name != NULL) {
+        unlink(pipe_name);
+        LOC_LOGD("fd = %d, %s\n", fd, pipe_name);
+    }
     return 0;
 }
 
diff --git a/platform_lib_abstractions/elapsed_millis_since_boot.cpp b/platform_lib_abstractions/platform_lib_time.cpp
similarity index 99%
rename from platform_lib_abstractions/elapsed_millis_since_boot.cpp
rename to platform_lib_abstractions/platform_lib_time.cpp
index e8cb93a9..45bb8e6b 100644
--- a/platform_lib_abstractions/elapsed_millis_since_boot.cpp
+++ b/platform_lib_abstractions/platform_lib_time.cpp
@@ -44,3 +44,5 @@ int64_t elapsedMillisSinceBoot()
     int64_t t_us = systemTime(0);
     return (int64_t) t_us / 1000LL;
 }
+
+
diff --git a/platform_lib_abstractions/platform_lib_time.h b/platform_lib_abstractions/platform_lib_time.h
index ce013afc..d2f9264a 100644
--- a/platform_lib_abstractions/platform_lib_time.h
+++ b/platform_lib_abstractions/platform_lib_time.h
@@ -28,6 +28,7 @@
 
 #ifndef _PLATFORM_LIB_TIME_H_
 #define _PLATFORM_LIB_TIME_H_
+#include <sys/time.h>
 
 int64_t systemTime(int clock);
 int64_t elapsedMillisSinceBoot();
diff --git a/utils/Makefile.am b/utils/Makefile.am
index e5935f05..13be4bb3 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -20,7 +20,7 @@ libgps_utils_so_la_c_sources = linked_list.c \
             msg_q.c \
             loc_cfg.cpp \
             loc_log.cpp \
-            ../platform_lib_abstractions/elapsed_millis_since_boot.cpp
+            ../platform_lib_abstractions/platform_lib_time.cpp
 
 library_includedir = $(pkgincludedir)/utils