diff --git a/apps/py_sems/Makefile b/apps/py_sems/Makefile
index b1b17143..8098d335 100644
--- a/apps/py_sems/Makefile
+++ b/apps/py_sems/Makefile
@@ -105,9 +105,9 @@ install_python_files: $(modules-prefix)/$(modules-dir)
 
 .PHONY: clean_py_sems_lib
 clean_py_sems_lib:
-	$(MAKE) -C sip/ cleaner
+	COREPATH=../$(COREPATH) $(MAKE) -C sip/ cleaner
 	rm -f py/*.pyc
 
 sip/py_sems_lib.a:
-	$(MAKE) -C sip/ Makefile.gen
-	$(MAKE) -C sip/ py_sems_lib.a
+	COREPATH=../$(COREPATH) $(MAKE) -C sip/ Makefile.gen
+	COREPATH=../$(COREPATH) $(MAKE) -C sip/ py_sems_lib.a
diff --git a/apps/py_sems/PySemsB2ABDialog.h b/apps/py_sems/PySemsB2ABDialog.h
index 8350c561..c99dde22 100644
--- a/apps/py_sems/PySemsB2ABDialog.h
+++ b/apps/py_sems/PySemsB2ABDialog.h
@@ -22,10 +22,10 @@
 #ifndef PY_SEMSB2ABDIALOG_H
 #define PY_SEMSB2ABDIALOG_H
 
+#include "PySems.h"
 #include "AmApi.h"
 #include "AmB2ABSession.h"
 #include "AmPlaylist.h"
-#include "PySems.h"
 
 class PySemsB2ABDialog : public AmB2ABCallerSession, 
   public PySemsDialogBase
diff --git a/apps/py_sems/PySemsB2BDialog.h b/apps/py_sems/PySemsB2BDialog.h
index 14b0781d..ff395922 100644
--- a/apps/py_sems/PySemsB2BDialog.h
+++ b/apps/py_sems/PySemsB2BDialog.h
@@ -23,10 +23,10 @@
 #ifndef PY_SEMSB2BDIALOG_H
 #define PY_SEMSB2BDIALOG_H
 
+#include "PySems.h"
 #include "AmApi.h"
 #include "AmB2BSession.h"
 #include "AmPlaylist.h"
-#include "PySems.h"
 
 class PySemsB2BDialog : public AmB2BCallerSession, 
   public PySemsDialogBase