diff --git a/build_mace_run.sh b/build_mace_run.sh
index 1b53a29435dc131a98c3b63bf6b907a2196fc450..93c971500c038ed03c29ffa44ffaf1e4b01a5587 100644
--- a/build_mace_run.sh
+++ b/build_mace_run.sh
@@ -49,6 +49,7 @@ else
     --copt="-D_GLIBCXX_USE_C99_MATH_TR1" \
     --copt="-Werror=return-type" \
     --copt="-DMACE_MODEL_TAG=${MODEL_TAG}" \
+    --define openmp=true \
     $PRODUCTION_MODE_BUILD_FLAGS \
     $HEXAGON_MODE_BUILD_FLAG || exit 1
 fi
diff --git a/build_production_code.sh b/build_production_code.sh
index 68f32fff8075ac0616dad409d2a9c042ef10cca6..5e845009f05c9c43cea5f6b1a63fc840287ca880 100644
--- a/build_production_code.sh
+++ b/build_production_code.sh
@@ -28,6 +28,7 @@ build_target()
     --copt="-std=c++11" \
     --copt="-D_GLIBCXX_USE_C99_MATH_TR1" \
     --copt="-Werror=return-type" \
+    --define openmp=true \
     --copt="-DMACE_OBFUSCATE_LITERALS" || exit 1
 }
 
diff --git a/generate_model_code.sh b/generate_model_code.sh
index 501deea7d871d1f1ed77b728a6faf0999fd9f217..1e48cb55c8122b54d8c1d2b2a4083a885f3d0392 100644
--- a/generate_model_code.sh
+++ b/generate_model_code.sh
@@ -9,6 +9,7 @@ mkdir -p ${MODEL_CODEGEN_DIR}
 if [ ${DSP_MODE} ]; then
     DSP_MODE_FLAG="--dsp_mode=${DSP_MODE}"
 fi
+
 bazel-bin/lib/python/tools/tf_converter --input=${TF_MODEL_FILE_PATH} \
                                         --output=${MODEL_CODEGEN_DIR}/model.cc \
                                         --input_node=${TF_INPUT_NODE} \
@@ -18,5 +19,6 @@ bazel-bin/lib/python/tools/tf_converter --input=${TF_MODEL_FILE_PATH} \
                                         --output_type=source \
                                         --template=${LIBMACE_SOURCE_DIR}/lib/python/tools/model.template \
                                         --model_tag=${MODEL_TAG} \
+                                        --input_shape=${INPUT_SHAPE} \
                                         ${DSP_MODE_FLAG} \
                                         --obfuscate=True || exit 1