diff --git a/plugins/zynaddsubfx/RemoteZynAddSubFx.h b/plugins/zynaddsubfx/RemoteZynAddSubFx.h
index a5eb91a38..3abd0c494 100644
--- a/plugins/zynaddsubfx/RemoteZynAddSubFx.h
+++ b/plugins/zynaddsubfx/RemoteZynAddSubFx.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _REMOTE_ZYNADDSUBFX_H
-#define _REMOTE_ZYNADDSUBFX_H
+#ifndef REMOTE_ZYNADDSUBFX_H
+#define REMOTE_ZYNADDSUBFX_H
 
 #include "RemotePlugin.h"
 
diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp
index 02808a63b..57f65b82a 100644
--- a/plugins/zynaddsubfx/ZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp
@@ -423,6 +423,9 @@ void ZynAddSubFxInstrument::initPlugin()
 					QSTR_TO_STDSTR(
 						QString( configManager::inst()->factoryPresetsDir() +
 								QDir::separator() + "ZynAddSubFX" ) ) ) );
+
+		m_remotePlugin->updateSampleRate( engine::mixer()->processingSampleRate() );
+
 		m_remotePlugin->showUI();
 		m_remotePlugin->unlock();
 	}
@@ -432,6 +435,7 @@ void ZynAddSubFxInstrument::initPlugin()
 		m_plugin->setSampleRate( engine::mixer()->processingSampleRate() );
 		m_plugin->setBufferSize( engine::mixer()->framesPerPeriod() );
 	}
+
 	m_pluginMutex.unlock();
 }
 
diff --git a/plugins/zynaddsubfx/ZynAddSubFx.h b/plugins/zynaddsubfx/ZynAddSubFx.h
index ed65d24f5..27154cff1 100644
--- a/plugins/zynaddsubfx/ZynAddSubFx.h
+++ b/plugins/zynaddsubfx/ZynAddSubFx.h
@@ -2,7 +2,7 @@
  * ZynAddSubFx.h - ZynAddSubFX-embedding plugin
  *
  * Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _ZYNADDSUBFX_H
-#define _ZYNADDSUBFX_H
+#ifndef ZYNADDSUBFX_H
+#define ZYNADDSUBFX_H
 
 #include <QtCore/QMap>
 #include <QtCore/QMutex>