diff --git a/include/BBTrackContainer.h b/include/BBTrackContainer.h
index aaff75c38..0ac84b6d3 100644
--- a/include/BBTrackContainer.h
+++ b/include/BBTrackContainer.h
@@ -41,9 +41,9 @@ public:
 	virtual bool play( MidiTime _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _tco_num = -1 );
 
-	virtual void updateAfterTrackAdd();
+	virtual void updateAfterTrackAdd() override;
 
-	inline virtual QString nodeName() const
+	inline virtual QString nodeName() const override
 	{
 		return "bbtrackcontainer";
 	}
diff --git a/plugins/vibed/vibrating_string.h b/plugins/vibed/vibrating_string.h
index c21ed43cf..06358501f 100644
--- a/plugins/vibed/vibrating_string.h
+++ b/plugins/vibed/vibrating_string.h
@@ -183,7 +183,7 @@ private:
 	* iteration. */
 	inline void toBridgeUpdate( delayLine * _dl, sample_t _insamp )
 	{
-		register sample_t * ptr = _dl->pointer;
+		sample_t * ptr = _dl->pointer;
 		*ptr = _insamp * m_stringLoss;
 		++ptr;
 		if( ptr > _dl->end )
@@ -202,7 +202,7 @@ private:
 	inline void fromBridgeUpdate( delayLine * _dl, 
 							sample_t _insamp )
 	{
-		register sample_t * ptr = _dl->pointer;
+		sample_t * ptr = _dl->pointer;
 		--ptr;
 		if( ptr < _dl->data )
 		{
diff --git a/src/core/PluginFactory.cpp b/src/core/PluginFactory.cpp
index 936b33cdc..a87e49270 100644
--- a/src/core/PluginFactory.cpp
+++ b/src/core/PluginFactory.cpp
@@ -47,7 +47,7 @@ std::unique_ptr<PluginFactory> PluginFactory::s_instance;
 PluginFactory::PluginFactory()
 {
 	// Adds a search path relative to the main executable if the path exists.
-	auto addRelativeIfExists = [this] (const QString& path) {
+	auto addRelativeIfExists = [](const QString & path) {
 		QDir dir(qApp->applicationDirPath());
 		if (!path.isEmpty() && dir.cd(path)) {
 			QDir::addSearchPath("plugins", dir.absolutePath());
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 9b65c6847..a80a2d8bd 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -77,11 +77,9 @@ const int SCROLLBAR_SIZE = 12;
 const int PIANO_X = 0;
 
 const int WHITE_KEY_WIDTH = 64;
-const int BLACK_KEY_WIDTH = 41;
 const int WHITE_KEY_SMALL_HEIGHT = 18;
 const int WHITE_KEY_BIG_HEIGHT = 24;
 const int BLACK_KEY_HEIGHT = 16;
-const int C_KEY_LABEL_X = WHITE_KEY_WIDTH - 19;
 const int KEY_LINE_HEIGHT = 12;
 const int OCTAVE_HEIGHT = KEY_LINE_HEIGHT * KeysPerOctave;	// = 12 * 12;