diff --git a/data/themes/cusis/style.css b/data/themes/cusis/style.css
index 5c61a6998..110e386d2 100644
--- a/data/themes/cusis/style.css
+++ b/data/themes/cusis/style.css
@@ -139,7 +139,7 @@ QToolBar {
 }
 
 
-fxMixerView QPushButton, effectRackView QPushButton, controllerRackView QPushButton {
+FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton {
 	font-size: 10px;
 }
 
@@ -149,7 +149,7 @@ timeLine {
 
 /* Plugins */
 
-tripleOscillatorView knob {
+TripleOscillatorView knob {
 	color: rgb(1, 114, 216);
 	qproperty-outerColor: rgb(0, 0, 0);
 	qproperty-innerRadius: 1;
@@ -171,7 +171,7 @@ kickerInstrumentView knob {
 }
 
 
-audioFileProcessorView knob {
+AudioFileProcessorView knob {
 	color: rgb(240, 147, 14);
 	qproperty-outerColor: rgb(30, 35, 37);
 	qproperty-innerRadius: 4;
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index b584aa4d8..30091d6fe 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -150,7 +150,7 @@ QToolButton:checked {
 	padding: 3px 0px 0px 3px;
 }
 
-fxMixerView QPushButton, effectRackView QPushButton, controllerRackView QPushButton {
+FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton {
 	font-size: 10px;
 }
 
@@ -160,7 +160,7 @@ timeLine {
 
 /* Plugins */
 
-tripleOscillatorView knob {
+TripleOscillatorView knob {
 	color: rgb(1, 114, 216);
 	qproperty-outerColor: rgb(0, 0, 0);
 	qproperty-innerRadius: 1;
@@ -182,7 +182,7 @@ kickerInstrumentView knob {
 }
 
 
-audioFileProcessorView knob {
+AudioFileProcessorView knob {
 	color: rgb(240, 147, 14);
 	qproperty-outerColor: rgb(30, 35, 37);
 	qproperty-innerRadius: 4;
diff --git a/plugins/midi_import/MidiImport.cpp b/plugins/midi_import/MidiImport.cpp
index 49924934a..15463c043 100644
--- a/plugins/midi_import/MidiImport.cpp
+++ b/plugins/midi_import/MidiImport.cpp
@@ -229,9 +229,11 @@ public:
 			if( it_inst )
 			{
 				isSF2 = true;
-				it_inst->loadResource(
-					configManager::inst()->
-						defaultSoundfont() );
+                if( configManager::inst()->defaultSoundfont() )
+                {
+                    it_inst->loadResource(
+                        configManager::inst()->defaultSoundfont() );
+                }
 				it_inst->childModel( "bank" )->setValue( 0 );
 				it_inst->childModel( "patch" )->setValue( 0 );
 			}
diff --git a/plugins/vst_base/remote_vst_plugin.cpp b/plugins/vst_base/remote_vst_plugin.cpp
index e2c96e971..0f9ba6c23 100644
--- a/plugins/vst_base/remote_vst_plugin.cpp
+++ b/plugins/vst_base/remote_vst_plugin.cpp
@@ -1069,14 +1069,10 @@ VstIntPtr RemoteVstPlugin::hostCallback( AEffect * _effect, VstInt32 _opcode,
 
 		case audioMasterGetSampleRate:
 			SHOW_CALLBACK( "amc: audioMasterGetSampleRate\n" );
-			__plugin->pluginDispatch( effSetSampleRate,
-				0, 0, NULL, (float)__plugin->sampleRate() );
 			return __plugin->sampleRate();
 
 		case audioMasterGetBlockSize:
 			SHOW_CALLBACK( "amc: audioMasterGetBlockSize\n" );
-			__plugin->pluginDispatch( effSetBlockSize,
-						0, __plugin->bufferSize() );
 
 			return __plugin->bufferSize();
 
diff --git a/src/core/lame_library.cpp b/src/core/lame_library.cpp
index 7e80136ee..beed0b451 100644
--- a/src/core/lame_library.cpp
+++ b/src/core/lame_library.cpp
@@ -44,6 +44,7 @@ LameLibrary::LameLibrary() :
 			QMessageBox::Ok | QMessageBox::Default );
 		delete m_lameLib;
 		m_lameLib = NULL;
+		return;
 	}
 
 	// grab the functions and stuff we need
@@ -155,6 +156,7 @@ LameLibrary::LameLibrary() :
 		m_lameLib->unload();
 		delete m_lameLib;
 		m_lameLib = NULL;
+		return;
 	}
 }