diff --git a/include/Song.h b/include/Song.h
index d0dac5a9c..81f12303d 100644
--- a/include/Song.h
+++ b/include/Song.h
@@ -263,7 +263,7 @@ public slots:
 	void playAndRecord();
 	void playTrack( Track * _trackToPlay );
 	void playBB();
-	void playPattern( Pattern* patternToPlay, bool _loop = true );
+	void playPattern(const Pattern* patternToPlay, bool _loop = true );
 	void togglePause();
 	void stop();
 
@@ -354,7 +354,7 @@ private:
 	tact_t m_length;
 
 	Track * m_trackToPlay;
-	Pattern* m_patternToPlay;
+	const Pattern* m_patternToPlay;
 	bool m_loopPattern;
 
 	double m_elapsedMilliSeconds;
diff --git a/include/Track.h b/include/Track.h
index 8c7e05f23..396c41e52 100644
--- a/include/Track.h
+++ b/include/Track.h
@@ -468,7 +468,7 @@ public:
 
 	int numOfTCOs();
 	TrackContentObject * getTCO( int _tco_num );
-	int getTCONum( TrackContentObject * _tco );
+	int getTCONum(const TrackContentObject* _tco );
 
 	const tcoVector & getTCOs() const
 	{
diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index ce686e79f..c9ac56452 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.cpp
@@ -473,7 +473,7 @@ void Song::playBB()
 
 
 
-void Song::playPattern( Pattern* patternToPlay, bool _loop )
+void Song::playPattern( const Pattern* patternToPlay, bool _loop )
 {
 	if( isStopped() == false )
 	{
diff --git a/src/core/Track.cpp b/src/core/Track.cpp
index 188d57e08..f12bdb069 100644
--- a/src/core/Track.cpp
+++ b/src/core/Track.cpp
@@ -2139,7 +2139,7 @@ TrackContentObject * Track::getTCO( int _tco_num )
  *  \param _tco The TrackContentObject to search for.
  *  \return its number in our array.
  */
-int Track::getTCONum( TrackContentObject * _tco )
+int Track::getTCONum( const TrackContentObject * _tco )
 {
 //	for( int i = 0; i < getTrackContentWidget()->numOfTCOs(); ++i )
 	tcoVector::iterator it = qFind( m_trackContentObjects.begin(),
diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp
index f47d8165b..dc14eca60 100644
--- a/src/gui/AutomationEditor.cpp
+++ b/src/gui/AutomationEditor.cpp
@@ -1934,7 +1934,7 @@ void AutomationEditor::play()
 		if( Engine::getSong()->playMode() != Song::Mode_PlayPattern )
 		{
 			Engine::getSong()->stop();
-			Engine::getSong()->playPattern( (Pattern *) Engine::pianoRoll()->currentPattern() );
+			Engine::getSong()->playPattern( Engine::pianoRoll()->currentPattern() );
 		}
 		else if( Engine::getSong()->isStopped() == false )
 		{
@@ -1942,7 +1942,7 @@ void AutomationEditor::play()
 		}
 		else
 		{
-			Engine::getSong()->playPattern( (Pattern *) Engine::pianoRoll()->currentPattern() );
+			Engine::getSong()->playPattern( Engine::pianoRoll()->currentPattern() );
 		}
 	}
 	else if( inBBEditor() )