diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp
index 4df5d3506..6334a1946 100644
--- a/src/gui/motorcontrol.cpp
+++ b/src/gui/motorcontrol.cpp
@@ -72,8 +72,11 @@ CMotorControl::CMotorControl(int tnum)
 
 CMotorControl::~CMotorControl()
 {
-printf("CMotorControl::~CMotorControl\n");
+	printf("CMotorControl::~CMotorControl\n");
+	delete sigscale;
+	delete snrscale;
 }
+
 void CMotorControl::Init(void)
 {
 	frameBuffer = CFrameBuffer::getInstance();
diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp
index b9ec2ae41..301345ac5 100644
--- a/src/zapit/src/capmt.cpp
+++ b/src/zapit/src/capmt.cpp
@@ -253,6 +253,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
 	uint8_t list = CCam::CAPMT_FIRST;
 	for (it = channel_map.begin(); it != channel_map.end(); /*++it*/)
 	{
+		cam = it->second;
 		channel = CServiceManager::getInstance()->FindChannel(it->first);
 		++it;
 		if(!channel)