diff --git a/ChangeLog b/ChangeLog
index 17d049e11..c45454b12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-15	Tobias Doerffel	<tobydox/at/users.sourceforge.net>
+
+	* include/audio_alsa.h:
+	do not include alsa-headers if they do not exist...
+
 2005-12-14	Tobias Doerffel	<tobydox/at/users.sourceforge.net>
 
 	* src/core/file_browser.cpp:
diff --git a/configure.in b/configure.in
index 0d4dce440..751f0d0a7 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.1.1-cvs20051214, tobydox/at/users.sourceforge.net)
-AM_INIT_AUTOMAKE(lmms, 0.1.1-cvs20051214)
+AC_INIT(lmms, 0.1.1-cvs20051215, tobydox/at/users.sourceforge.net)
+AM_INIT_AUTOMAKE(lmms, 0.1.1-cvs20051215)
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/include/midi_alsa_seq.h b/include/midi_alsa_seq.h
index a7830d5b7..968e371ed 100644
--- a/include/midi_alsa_seq.h
+++ b/include/midi_alsa_seq.h
@@ -36,10 +36,10 @@
 #define ALSA_SUPPORT
 #endif
 
-#endif
-
 #include <alsa/asoundlib.h>
 
+#endif
+
 #include "qt3support.h"
 
 #ifdef QT4
diff --git a/src/core/song_editor.cpp b/src/core/song_editor.cpp
index dacfb1d1f..dc248866c 100644
--- a/src/core/song_editor.cpp
+++ b/src/core/song_editor.cpp
@@ -623,7 +623,7 @@ void songEditor::wheelEvent( QWheelEvent * _we )
 
 void songEditor::masterVolumeChanged( int _new_val )
 {
-	if( m_mvsStatus->isShown() == FALSE )
+	if( m_mvsStatus->isVisible() == FALSE )
 	{
 		masterVolumeMoved( _new_val );
 		m_mvsStatus->reparent( m_masterVolumeSlider );
@@ -665,7 +665,7 @@ void songEditor::masterVolumeReleased( void )
 
 void songEditor::masterPitchChanged( int _new_val )
 {
-	if( m_mpsStatus->isShown() == FALSE )
+	if( m_mpsStatus->isVisible() == FALSE )
 	{
 		masterPitchMoved( _new_val );
 		m_mpsStatus->reparent( m_masterPitchSlider );
diff --git a/src/widgets/group_box.cpp b/src/widgets/group_box.cpp
index f66cfc6f1..25ee54000 100644
--- a/src/widgets/group_box.cpp
+++ b/src/widgets/group_box.cpp
@@ -223,7 +223,7 @@ void groupBox::updatePixmap( void )
 #ifdef QT4
 	QPalette pal = palette();
 	pal.setBrush( backgroundRole(), QBrush( pm ) );
-	pal.setColor( QPalette::Background, QColor( 96, 96, 96 ) );
+/*	pal.setColor( QPalette::Background, QColor( 96, 96, 96 ) );*/
 	setPalette( pal );
 #else
 	setPaletteBackgroundColor( QColor( 96, 96, 96 ) );