diff --git a/tools/generate_production_code.sh b/tools/generate_production_code.sh
index d2c0c2f650a6633ea711555da99b83a53613253b..2015846cf63cc38ced0f465d24252c1c169787c6 100644
--- a/tools/generate_production_code.sh
+++ b/tools/generate_production_code.sh
@@ -25,13 +25,6 @@ if [ "$PULL_OR_NOT" = 1 ]; then
   fi
 fi
 
-rm -rf ${CL_CODEGEN_DIR}
-mkdir -p ${CL_CODEGEN_DIR}
-rm -rf ${TUNING_CODEGEN_DIR}
-mkdir -p ${TUNING_CODEGEN_DIR}
-
-set -x
-
 python mace/python/tools/opencl_codegen.py \
   --cl_binary_dirs=${CL_BIN_DIRS} \
   --output_path=${CL_CODEGEN_DIR}/opencl_compiled_program.cc
diff --git a/tools/merge_libs.sh b/tools/merge_libs.sh
index c0672e77e985f423ea1002a8608d5eeeea14a87a..c872e8617436df12f4968936f4e9e163958de94f 100644
--- a/tools/merge_libs.sh
+++ b/tools/merge_libs.sh
@@ -22,7 +22,7 @@ rm -rf ${LIBMACE_BUILD_DIR}/libmace
 mkdir -p ${LIBMACE_BUILD_DIR}/libmace/include/mace/public
 mkdir -p ${LIBMACE_BUILD_DIR}/libmace/lib
 mkdir -p ${MODEL_DATA_DIR}
-cp -rf ${MACE_SOURCE_DIR}/mace/public/*.h ${LIBMACE_BUILD_DIR}/libmace/
+cp -rf ${MACE_SOURCE_DIR}/mace/public/*.h ${LIBMACE_BUILD_DIR}/libmace/include/mace/public/
 cp ${MACE_SOURCE_DIR}/mace/core/runtime/hexagon/libhexagon_controller.so ${LIBMACE_BUILD_DIR}/libmace/lib
 
 LIBMACE_TEMP_DIR=`mktemp -d -t libmace.XXXX`