diff --git a/DSView/pv/dialogs/interval.cpp b/DSView/pv/dialogs/interval.cpp
index dcb13ca5..1304bdd5 100755
--- a/DSView/pv/dialogs/interval.cpp
+++ b/DSView/pv/dialogs/interval.cpp
@@ -44,8 +44,6 @@ Interval::Interval(SigSession *session, QWidget *parent) :
     _interval_spinBox->setButtonSymbols(QAbstractSpinBox::NoButtons);
     _interval_slider = new QSlider(Qt::Horizontal, this);
     _interval_slider->setRange(1, 10);
-    connect(_interval_slider, SIGNAL(valueChanged(int)), _interval_spinBox, SLOT(setValue(int)));
-    connect(_interval_spinBox, SIGNAL(valueChanged(int)), _interval_slider, SLOT(setValue(int)));
 
     _interval_slider->setValue(_session->get_repeat_intvl());
 
@@ -59,6 +57,8 @@ Interval::Interval(SigSession *session, QWidget *parent) :
     setTitle(tr("Repetitive Interval"));
 
     connect(&_button_box, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(_interval_slider, SIGNAL(valueChanged(int)), _interval_spinBox, SLOT(setValue(int)));
+    connect(_interval_spinBox, SIGNAL(valueChanged(int)), _interval_slider, SLOT(setValue(int)));
 }
 
 void Interval::accept()
diff --git a/libsigrokdecode4DSL/decoders/0-i2c/pd.py b/libsigrokdecode4DSL/decoders/0-i2c/pd.py
index dad9922d..467df605 100644
--- a/libsigrokdecode4DSL/decoders/0-i2c/pd.py
+++ b/libsigrokdecode4DSL/decoders/0-i2c/pd.py
@@ -77,7 +77,7 @@ class Decoder(srd.Decoder):
     )
     options = (
         {'id': 'address_format', 'desc': 'Displayed slave address format',
-            'default': 'shifted', 'values': ('shifted', 'unshifted')},
+            'default': 'unshifted', 'values': ('shifted', 'unshifted')},
     )
     annotations = (
         ('7', 'start', 'Start condition'),
diff --git a/libsigrokdecode4DSL/decoders/1-i2c/pd.py b/libsigrokdecode4DSL/decoders/1-i2c/pd.py
index a163eba4..3024bd6f 100644
--- a/libsigrokdecode4DSL/decoders/1-i2c/pd.py
+++ b/libsigrokdecode4DSL/decoders/1-i2c/pd.py
@@ -78,7 +78,7 @@ class Decoder(srd.Decoder):
     )
     options = (
         {'id': 'address_format', 'desc': 'Displayed slave address format',
-            'default': 'shifted', 'values': ('shifted', 'unshifted')},
+            'default': 'unshifted', 'values': ('shifted', 'unshifted')},
     )
     annotations = (
         ('7', 'start', 'Start condition'),