diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index c723d8d6dc95e9acd0a24537d4b0d783e050fc9c..1e2528f75024635703d16e4df5fd7e3428bf7860 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -42,13 +42,13 @@ THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
 source $THIS_SCRIPT_PATH/tools/build_helper
 
 MSC_GEN="False"
-XFORMS="False"
+XFORMS="True"
 PRINT_STATS="False"
 VCD_TIMING="False"
 LOWLATENCY_FLAG_USER="False"
 FORCE_LOWLATENCY_FLAG_USER=""
 REL="Rel10"
-HW="EXMIMO"
+HW="None"
 NOS1=0
 EPC=0
 VERBOSE_COMPILE=0
@@ -90,7 +90,7 @@ Options
    default is Rel10,
    Rel8 limits the implementation to 3GPP Release 8 version
 -w | --hardware
-   EXMIMO (Default), USRP, BLADERF, ETHERNET, None
+   EXMIMO, USRP, BLADERF, ETHERNET, None (Default)
    Adds this RF board support (in external packages installation and in compilation)
 --oaisim
    Makes the oaisim simulator. Hardware will be defaulted to "NONE".
@@ -175,6 +175,9 @@ function main() {
        -w | --hardware)
             HW="$2" #"${i#*=}"
             # Use OAI_USRP  as the key word USRP is used inside UHD driver
+            if [ "$HW" == "EXMIMO" ] ; then 
+		HW="EXMIMO"
+	    fi 
             if [ "$HW" == "USRP" ] ; then 
 		HW="OAI_USRP"
 	    fi