diff --git a/configure.ac b/configure.ac
index 3c80804542..a0286e7d8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1077,7 +1077,7 @@ ext/rtp/Makefile
 ext/sdl/Makefile
 ext/shout/Makefile
 ext/sidplay/Makefile
-ext/smoothwave/Makefile
+ext/smooothwave/Makefile
 ext/vorbis/Makefile
 ext/xmms/Makefile
 gst-libs/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 3ebdc5aaad..b889fb382a 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -161,7 +161,7 @@ SHOUT_DIR=
 endif
 
 if USE_SMOOTHWAVE
-SMOOTHWAVE_DIR=smoothwave
+SMOOTHWAVE_DIR=smooothwave
 else
 SMOOTHWAVE_DIR=
 endif
diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c
index 0833b45a00..429d733977 100644
--- a/ext/mpeg2dec/gstmpeg2dec.c
+++ b/ext/mpeg2dec/gstmpeg2dec.c
@@ -548,10 +548,10 @@ gst_mpeg2dec_change_state (GstElement *element)
       /* if we are not closed by an EOS event do so now, this cen send a few frames but
        * we are prepared to not really send them (see above) */
       if (!mpeg2dec->closed) {
-        mpeg2_close (mpeg2dec->decoder);
+        //mpeg2_close (mpeg2dec->decoder);
 	mpeg2dec->closed = TRUE;
+        gst_mpeg2dec_vo_destroy (mpeg2dec);
       }
-      gst_mpeg2dec_vo_destroy (mpeg2dec);
       break;
     case GST_STATE_READY_TO_NULL:
       break;