diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h
index a87701afc..aa32ae0b9 100644
--- a/src/zapit/include/zapit/zapit.h
+++ b/src/zapit/include/zapit/zapit.h
@@ -17,6 +17,7 @@
 #include <zapit/channel.h>
 #include <zapit/bouquets.h>
 #include <zapit/femanager.h>
+#include <zapit/fastscan.h>
 
 #define PAL	0
 #define NTSC	1
@@ -130,7 +131,9 @@ class CZapit : public OpenThreads::Thread
 
 		CZapitChannel * current_channel;
 		t_channel_id live_channel_id;
+		/* scan params */
 		TP_params TP;
+		fast_scan_type_t scant;
 
 		CFrontend * live_fe;
 
diff --git a/src/zapit/src/fastscan.cpp b/src/zapit/src/fastscan.cpp
index 0e9e8c7b4..e744fb4a5 100644
--- a/src/zapit/src/fastscan.cpp
+++ b/src/zapit/src/fastscan.cpp
@@ -63,13 +63,13 @@ void CServiceScan::InitFastscanLnb(int id)
 	switch(id) {
 		default:
 		case CD_OPERATOR_ID:
-		case OPERATOR_TVV:
+		case TVV_OPERATOR_ID:
 			satmap[192].diseqc = 0;
 			satmap[235].diseqc = 1;
 			satmap[282].diseqc = 2;
 			satmap[130].diseqc = 3;
 			break;
-		case OPERATOR_TELESAT:
+		case TELESAT_OPERATOR_ID:
 			satmap[130].diseqc = 0;
 			satmap[192].diseqc = 1;
 			satmap[235].diseqc = 2;
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 907232ea0..fe7fc63f6 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -807,8 +807,6 @@ bool CZapit::StartScanTP(TP_params * TPparams)
 
 bool CZapit::StartFastScan(int scan_mode, int opid)
 {
-	fast_scan_type_t scant;
-
 	scant.type = scan_mode;
 	scant.op = (fs_operator_t) opid;