diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am
index f3dc7d972..537cb307c 100644
--- a/lib/libtuxtxt/Makefile.am
+++ b/lib/libtuxtxt/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/libconfigfile \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
-	$(FREETYPE_CFLAGS) \
+	@FREETYPE_CFLAGS@ \
 	@SIGC_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp
index 5364a64b8..7987eb5a0 100644
--- a/src/zapit/src/femanager.cpp
+++ b/src/zapit/src/femanager.cpp
@@ -371,7 +371,9 @@ void CFEManager::saveSettings(bool write)
 void CFEManager::copySettings(CFrontend * from, CFrontend * to)
 {
 	INFO("Copy settings fe %d -> fe %d", from->fenumber, to->fenumber);
-	if (to->config.diseqcType != DISEQC_UNICABLE || to->config.diseqcType != DISEQC_UNICABLE2 || to->getMode() == CFrontend::FE_MODE_LINK_LOOP)
+	if ((to->config.diseqcType != DISEQC_UNICABLE &&
+	     to->config.diseqcType != DISEQC_UNICABLE2) ||
+	     to->getMode() == CFrontend::FE_MODE_LINK_LOOP)
 		to->config.diseqcType = from->config.diseqcType;
 
 	to->config.diseqcRepeats = from->config.diseqcRepeats;