diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp
index 751c8b54d16..987beed3e05 100644
--- a/src/core/AutomatableModel.cpp
+++ b/src/core/AutomatableModel.cpp
@@ -221,7 +221,7 @@ void AutomatableModel::setValue( const float value )
 	++m_setValueDepth;
 	const float old_val = m_value;
 
-	m_value = fittedValue( value, true );
+	m_value = fittedValue( value );
 	if( old_val != m_value )
 	{
 		// add changes to history so user can undo it
diff --git a/src/core/TempoSyncKnobModel.cpp b/src/core/TempoSyncKnobModel.cpp
index c3583f88a26..690b230ba11 100644
--- a/src/core/TempoSyncKnobModel.cpp
+++ b/src/core/TempoSyncKnobModel.cpp
@@ -138,9 +138,9 @@ void TempoSyncKnobModel::saveSettings( QDomDocument & _doc, QDomElement & _this,
 void TempoSyncKnobModel::loadSettings( const QDomElement & _this,
 							const QString & _name )
 {
- 	setSyncMode( ( TempoSyncMode ) _this.attribute( "syncmode" ).toInt() );
-	m_custom.loadSettings( _this, _name );
 	FloatModel::loadSettings( _this, _name );
+	m_custom.loadSettings( _this, _name );
+	setSyncMode( ( TempoSyncMode ) _this.attribute( "syncmode" ).toInt() );
 }