diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 7cd5f2ec7..ba8f4b71f 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -170,7 +170,8 @@ MessagesDialog::LockUpdate::LockUpdate (MessagesDialog *pDialog, bool bUpdate)
 
 MessagesDialog::LockUpdate::~LockUpdate ()
 {
-    m_pDialog->m_nLockUpdate = qMax (--m_pDialog->m_nLockUpdate, 0);
+    if(--m_pDialog->m_nLockUpdate < 0)
+        m_pDialog->m_nLockUpdate = 0;
 
     if (m_bUpdate && m_pDialog->m_nLockUpdate == 0) {
         m_pDialog->insertMessages();
diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp
index 48185589c..9137beb7e 100644
--- a/retroshare-gui/src/gui/settings/rsettingswin.cpp
+++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp
@@ -100,7 +100,7 @@ RSettingsWin::initStackedWidget()
     stackedWidget->setCurrentIndex(-1);
     stackedWidget->removeWidget(stackedWidget->widget(0));
 
-    stackedWidget->addWidget(new GeneralPage(false));
+    stackedWidget->addWidget(new GeneralPage(0));
     stackedWidget->addWidget(new ServerPage());
     stackedWidget->addWidget(new TransferPage());
     stackedWidget->addWidget(new DirectoriesPage());