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/include/debug.h b/include/debug.h
index bb5bce557..207c9680e 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -34,7 +34,9 @@
 #ifdef LMMS_DEBUG
 	#include <assert.h>
 #else
+    #ifndef assert
 	#define assert(x) ((void)(x))
+    #endif
 #endif
 #include <cstdio>