diff --git a/INSTALL.md b/INSTALL.md
index e638bfb7d..d0d922f86 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -5,7 +5,8 @@ Prerequisite
     sudo apt-get install autoconf libtool m4 pkg-config
     sudo apt-get install libsctp-dev
     sudo apt-get install freediameter-dev
-    sudo apt-get install libmongoc-1.0-0
+    sudo apt-get install mongodb
+    sudo apt-get install libmongoc-1.0
 
 
 Build from Git
diff --git a/lib/base/context.c b/lib/base/context.c
index 9f746c356..949842a56 100644
--- a/lib/base/context.c
+++ b/lib/base/context.c
@@ -1,7 +1,8 @@
 #define TRACE_MODULE _context
 
-#include <mongoc.h>
 #include "core_file.h"
+#include "core_debug.h"
+#include <mongoc.h>
 
 #include "context.h"
 
diff --git a/src/hss/hss_context.c b/src/hss/hss_context.c
index 208bbac80..eb1c78ea4 100644
--- a/src/hss/hss_context.c
+++ b/src/hss/hss_context.c
@@ -1,10 +1,10 @@
 #define TRACE_MODULE _hss_context
 
-#include <mongoc.h>
-
 #include "core_debug.h"
 #include "core_lib.h"
 
+#include <mongoc.h>
+
 #include "context.h"
 #include "hss_context.h"
 
@@ -196,12 +196,8 @@ status_t hss_db_increment_sqn(char *imsi_bcd)
     bson_t *query = NULL;
     bson_t *update = NULL;
     bson_error_t error;
-    char printable_rand[128];
     c_uint64_t max_sqn = 0x7ffffffffff;
 
-    d_assert(rand, return CORE_ERROR, "Null param");
-    core_hex_to_ascii(rand, RAND_LEN, printable_rand, sizeof(printable_rand));
-
     mutex_lock(self.db_lock);
 
     query = BCON_NEW("imsi", BCON_UTF8(imsi_bcd));
@@ -238,13 +234,13 @@ out:
 
     mutex_unlock(self.db_lock);
 
-    return CORE_OK;
+    return rv;
 }
 
 status_t hss_db_subscription_data(
     char *imsi_bcd, hss_db_subscription_data_t *subscription_data)
 {
-    status_t rv = CORE_ERROR;
+    status_t rv = CORE_OK;
     mongoc_cursor_t *cursor = NULL;
     bson_t *query = NULL;
     bson_error_t error;
@@ -446,5 +442,5 @@ out:
 
     mutex_unlock(self.db_lock);
 
-    return CORE_OK;
+    return rv;
 }
diff --git a/src/init.c b/src/init.c
index ac2f5751a..f6c0eb9e7 100644
--- a/src/init.c
+++ b/src/init.c
@@ -47,7 +47,7 @@ status_t app_will_initialize(char *config_path, char *log_path)
     return CORE_OK;
 }
 
-status_t app_did_initialize()
+status_t app_did_initialize(char *config_path, char *log_path)
 {
     status_t rv;
 
diff --git a/support/nextepc.conf.in b/support/nextepc.conf.in
index e29a60b18..f30666cd1 100644
--- a/support/nextepc.conf.in
+++ b/support/nextepc.conf.in
@@ -4,12 +4,12 @@
 
   HSS :
   {
-    S6A_CONFIG_PATH : "/Users/acetcom/Documents/git/nextepc/install/hss_fd.conf"
+    S6A_CONFIG_PATH : "@prefix@/etc/hss_fd.conf"
   }
 
   MME :
   {
-    S6A_CONFIG_PATH : "/Users/acetcom/Documents/git/nextepc/install/mme_fd.conf",
+    S6A_CONFIG_PATH : "@prefix@/etc/mme_fd.conf",
 
     DEFAULT_PAGING_DRX : "v64",
 #RELATIVE_CAPACITY : 255,