diff --git a/configure.ac b/configure.ac
index bcbb18b31..243e03534 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,15 @@ AC_ARG_ENABLE(freesatepg,
 	[  --enable-freesatepg                  enable Freesat EPG code (experimental)],
 	[AC_DEFINE(ENABLE_FREESATEPG,1,[enable Freesat EPG code])])
 
+AC_ARG_ENABLE(giflib,
+	AS_HELP_STRING(--enable-giflib,use giflib instead of libungif),
+	,[enable_giflib=no])
+
+AM_CONDITIONAL(ENABLE_GIFLIB,test "$enable_giflib" = "yes")
+if test "$enable_giflib" = "yes"; then
+	AC_DEFINE(ENABLE_GIFLIB,1,[use giflib instead of libungif])
+fi
+
 # FLAC - Free Lossless Audio Codec
 AC_ARG_ENABLE(flac,
 	AS_HELP_STRING(--enable-flac,include FLAC support),
diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp
index 967469616..f0e6d69c9 100644
--- a/src/driver/volume.cpp
+++ b/src/driver/volume.cpp
@@ -44,16 +44,18 @@
 #endif
 
 CFrameBuffer * frameBuffer;
-CRemoteControl * v_RemoteControl;
+extern CRemoteControl * g_RemoteControl;
 extern cAudio * audioDecoder;
 static CProgressBar *g_volscale = NULL;
 
 CVolume::CVolume()
 {
 	frameBuffer	= CFrameBuffer::getInstance();
+#if 0
 	g_Zapit		= new CZapitClient;
 	g_RCInput	= new CRCInput;
 	v_RemoteControl	= new CRemoteControl;
+#endif
 	VolumeFont	= SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO;
 	paintDigits	= true;  // For future On/Off digits
 	paintShadow	= false; // For future On/Off switch shadow
@@ -256,7 +258,7 @@ void CVolume::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool nowa
 		if (msg <= CRCInput::RC_MaxRC) 
 		{
 			int sub_chan_keybind = 0;
-			if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME && v_RemoteControl->subChannels.size() < 1)
+			if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME && g_RemoteControl->subChannels.size() < 1)
  			     sub_chan_keybind = 1;
 			
 			if ((msg == CRCInput::RC_plus) || (sub_chan_keybind == 1 && (msg == CRCInput::RC_right))) {
diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 8eade5cef..2fc658f2f 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -2049,6 +2049,8 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 
 bool CZapit::Stop()
 {
+	if(!started)
+		return false;
 	started = false;
 	int ret = join();
 	return (ret == 0);