diff --git a/Makefile b/Makefile
index 76b99da..fb634f1 100644
--- a/Makefile
+++ b/Makefile
@@ -46,12 +46,16 @@ LIBRARIES =    	-lcurses \
 
 INSTALL_PATH ?= ./install
 
-
+INSTALL_PATH ?= ./install
 
 CXX_FLAGS = -std=c++11 -g -O3 -rdynamic -Wall -MMD -MP -fPIC ${INCLUDE_PATH} -Werror -Wno-literal-suffix
 
 CXX_FLAGS +=-fno-omit-frame-pointer -Wno-ignored-qualifiers -Werror=return-type -Wextra -Wno-long-long -Winit-self -Wno-unused-local-typedefs  -Woverloaded-virtual ${COMPILETIME_ROOT} ${FALLTHROUGH_FLAGS}
 
+ifdef MAP_TYPE
+CXX_FLAGS += ${MAP_TYPE}
+endif
+
 LINK_LIBRARY_FLAGS = -shared -fPIC -Wall -g -O3 -rdynamic ${LIBRARY_PATH} ${LIBRARIES} -Wl,-rpath=$(RUNTIME_LDPATH)/lib ${COMPILETIME_ROOT}
 
 LINK_EXE_FLAGS = -Wall -g -O3 -rdynamic ${LIBRARY_PATH} ${LIBRARIES} \
@@ -151,5 +155,12 @@ bin/% : obj/standalone/%.o
 	${CXX} ${LINK_EXE_FLAGS} ${UHAL_LIBRARY_FLAGS} ${UHAL_LIBRARIES} -lBUTool_GenericIPBus -lboost_system -lpugixml ${EXE_GENERIC_IPBUS_STANDALONE_OBJECT_FILES} $^ -o $@
 
 
+# -------------------
+# Install
+# -------------------
+install: all
+	install -m 775 -d ${INSTALL_PATH}/lib
+	install -b -m 775 ./lib/* ${INSTALL_PATH}/lib
+
 -include $(LIBRARY_OBJECT_FILES:.o=.d)
 
diff --git a/src/GenericIPBus_device/GenericIPBus_device.cc b/src/GenericIPBus_device/GenericIPBus_device.cc
index 5f266d4..44217be 100644
--- a/src/GenericIPBus_device/GenericIPBus_device.cc
+++ b/src/GenericIPBus_device/GenericIPBus_device.cc
@@ -103,6 +103,7 @@ void GenericIPBusDevice::LoadCommandList(){
 
 CommandReturn::status GenericIPBusDevice::DumpDebug(std::vector<std::string> /*strArg*/,
 						std::vector<uint64_t> /*intArg*/){
+/*
   std::stringstream outfileName;
   outfileName << "Apollo_debug_dump_";  
 
@@ -117,6 +118,7 @@ CommandReturn::status GenericIPBusDevice::DumpDebug(std::vector<std::string> /*s
   std::ofstream outfile(outfileName.str().c_str(),std::ofstream::out);
   outfile << outfileName.str() << std::endl;
   SM->DebugDump(outfile);
-  outfile.close();  
+  outfile.close();
+*/
   return CommandReturn::OK;
 }