diff --git a/configure.ac b/configure.ac
index 2203296e..edaf5c02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # Copyright (C) 2007 Stelios Bounanos, M0GLD (m0gld AT enotty DOT net)
 
 AC_PREREQ(2.61)
-AC_INIT([fldigi], [2.07], [w1hkj AT w1hkj DOT com])
+AC_INIT([fldigi], [2.08a], [w1hkj AT w1hkj DOT com])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign 1.9.6])
 AM_MAINTAINER_MODE
@@ -86,6 +86,7 @@ if test "x$ac_cv_debug" = "xyes"; then
         RDYNAMIC=-rdynamic
     fi
     CXXFLAGS="-O0 -ggdb3 -Wall"
+    CFLAGS="$CXXFLAGS"
     AC_MSG_NOTICE([debugging enabled; overriding CXXFLAGS])
 fi
 AM_CONDITIONAL([ENABLE_DEBUG], [test "x$ac_cv_debug" = "xyes"])
diff --git a/src/Makefile.am b/src/Makefile.am
index 31ac79da..b38e550d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/irrxml @BOOST_CPPFLAGS
 AM_CXXFLAGS = @FLTK_CFLAGS@ @PORTAUDIOCPP_CFLAGS@ @SNDFILE_CFLAGS@ \
 	@SAMPLERATE_CFLAGS@ @HAMLIB_CFLAGS@ \
 	-pipe -Wall -O2 -ffast-math -fno-rtti -fexceptions -finline-functions
+AM_CFLAGS = $(AM_CXXFLAGS)
 
 LDADD = @BOOST_LDFLAGS@ @FLTK_LIBS@ @PORTAUDIOCPP_LIBS@ @SNDFILE_LIBS@ \
 	@SAMPLERATE_LIBS@ @HAMLIB_LIBS@ @RTLIB@
diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx
index 4ea737d4..55da7e2a 100644
--- a/src/dialogs/fl_digi.cxx
+++ b/src/dialogs/fl_digi.cxx
@@ -313,7 +313,8 @@ void init_modem(trx_mode mode)
 		return init_modem(mode);
 
 	case MODE_CW:
-		startup_modem(*mode_info[mode].modem ? *mode_info[mode].modem : new cw);
+		startup_modem(*mode_info[mode].modem ? *mode_info[mode].modem :
+			      *mode_info[mode].modem = new cw);
 		modem_config_tab = tabCW;
 		break;