diff --git a/functions.mk b/functions.mk
index 5c1b98f..b3dc166 100644
--- a/functions.mk
+++ b/functions.mk
@@ -195,7 +195,7 @@ $(GEN)/$(CWD)/$(2).pb.cc:	$(SRC)/$(CWD)/$(1)
 
 # We use the add_c++_source to do most of the work, then simply point
 # to the file
-$$(eval $$(call add_c++_source,$(2).pb.cc,$(2).pb,$(GEN),-IXX))
+$$(eval $$(call add_c++_source,$(2).pb.cc,$(2).pb,$(GEN),))
 
 
 # Point to the object file produced by the previous macro
diff --git a/python.mk b/python.mk
index 19dba38..4277ce4 100644
--- a/python.mk
+++ b/python.mk
@@ -30,12 +30,12 @@ define add_swig_source
 ifneq ($(PREMAKE),1)
 $(if $(trace),$$(warning called add_swig_source "$(1)" "$(2)"))
 
-BUILD_$(OBJ)/$(CWD)/$(2)_wrap.cxx_COMMAND := swig -python -c++  -MMD -MF $(OBJ)/$(CWD)/$(2).d -MT "$(OBJ)/$(CWD)/$(2)_wrap.cxx $(OBJ)/$(CWD)/$(2).lo" -o $(OBJ)/$(CWD)/$(2)_wrap.cxx~ $(SRC)/$(CWD)/$(1)
+BUILD_$(OBJ)/$(CWD)/$(2)_wrap.cxx_COMMAND := swig -python -c++  -MMD -MF $(OBJ)/$(CWD)/$(2).d -MT "$(OBJ)/$(CWD)/$(2)_wrap.cxx $(OBJ)/$(CWD)/$(2).lo" -outdir $(SRC)/$(CWD) -o $(OBJ)/$(CWD)/$(2)_wrap.cxx~ $(SRC)/$(CWD)/$(1)
 
 # Call swig to generate the source file
 $(OBJ)/$(CWD)/$(2)_wrap.cxx:	$(SRC)/$(CWD)/$(1)
 	@mkdir -p $(OBJ)/$(CWD)
-	$$(if $(verbose_build),@echo $$(BUILD_$(OBJ)/$(CWD)/$(2)_wrap.cxx_COMMAND),@echo "[SWIG python] $(CWD)/$(1)")
+	$$(if $(verbose_build),@echo $$(BUILD_$(OBJ)/$(CWD)/$(2)_wrap.cxx_COMMAND),@echo "   $(COLOR_BLUE)[SWIG python]$(COLOR_RESET) $(CWD)/$(1)")
 	@$$(BUILD_$(OBJ)/$(CWD)/$(2)_wrap.cxx_COMMAND)
 	@mv $$@~ $$@