diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.generic.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.generic.conf
index f5ca43821b8b9c5ea503e795c1e9f46cb65023e4..950261e6bcd69f6fe1b675e5db81cb785f0003ed 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.generic.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.generic.conf
@@ -88,7 +88,7 @@ MME :
     S6A :
     {
         # pwd=$OPENAIR_CN/objs
-        S6A_CONF                   = "./s6a.conf";
+        S6A_CONF                   = "./epc_s6a.conf";
         HSS_HOSTNAME = "to_do_here_put_your_hss_host_name";
     };
 
@@ -120,7 +120,7 @@ MME :
         # maximum of 65535 values, comma separated
         MME_GID = [ 32768 , 4 , 5 , 30 , 8 , 9 , 50021 ];
 
-        # TA (mcc.mnc:tracking area code) DEFAULT = 208.34:0
+        # TA (mcc.mnc:tracking area code) DEFAULT = 208.92:1
         # max values = 999.999:65535
         # maximum of 32 values, comma separated
         PLMN = ( 
@@ -175,6 +175,8 @@ P-GW =
 
         PGW_INTERFACE_NAME_FOR_SGI            = "eth3";
         PGW_IPV4_ADDRESS_FOR_SGI              = "192.168.14.17/24";
+        # Option available only if GTPU in kernel configured
+        PGW_MASQUERADE_SGI                    = "no";
     };
     
     IP_ADDRESS_POOL :
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.on.enb.example.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.on.enb.example.conf
index e914b9b90714ad42e1754302430fbe2f9940d1cc..e934b33a53f9362e871a997a7fe3b40dd21045b1 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.on.enb.example.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/epc.on.enb.example.conf
@@ -58,7 +58,7 @@ MME :
     {
         # pwd=$OPENAIR_CN/objs
         S6A_CONF                   = "./epc_s6a.conf";
-        HSS_HOSTNAME = "yang";
+        HSS_HOSTNAME = "to_do_here_put_your_hss_host_name";
     };
 
     # ------- SCTP definitions
@@ -127,7 +127,7 @@ S-GW :
         SGW_IPV4_ADDRESS_FOR_S11                = "0.0.0.0/24";
 
         SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP    = "tun3";
-        SGW_INTERFACE_MTU_FOR_S1U_S12_S4_UP     = 1564
+        SGW_INTERFACE_MTU_FOR_S1U_S12_S4_UP     = 1564;
         SGW_IPV4_ADDRESS_FOR_S1U_S12_S4_UP      = "192.188.3.3/24";
         # TODO  PORT NUMBER
         SGW_IPV4_PORT_FOR_S1U_S12_S4_UP         = 2152;