diff --git a/src/dict/loaddictionaries.cc b/src/dict/loaddictionaries.cc
index fc4bb737..e369ac6e 100644
--- a/src/dict/loaddictionaries.cc
+++ b/src/dict/loaddictionaries.cc
@@ -224,7 +224,7 @@ void loadDictionaries( QWidget * parent,
 
   loadDicts.wait();
 
-  if ( loadDicts.getExceptionText().size() ) {
+  if ( !loadDicts.getExceptionText().empty() ) {
     QMessageBox::critical( parent,
                            QCoreApplication::translate( "LoadDictionaries", "Error loading dictionaries" ),
                            QString::fromUtf8( loadDicts.getExceptionText().c_str() ) );
diff --git a/src/ui/editdictionaries.cc b/src/ui/editdictionaries.cc
index 1b30f100..103aa3a6 100644
--- a/src/ui/editdictionaries.cc
+++ b/src/ui/editdictionaries.cc
@@ -183,9 +183,9 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups )
 {
   dictionariesChanged = true;
 
-  Config::Groups savedGroups  = cfg.groups;
-  Config::Group savedOrder    = cfg.dictionaryOrder;
-  Config::Group savedInactive = cfg.inactiveDictionaries;
+  Config::Groups savedGroups  = groups->getGroups();
+  Config::Group savedOrder    = orderAndProps->getCurrentDictionaryOrder();
+  Config::Group savedInactive = orderAndProps->getCurrentInactiveDictionaries();
 
   cfg.paths           = sources.getPaths();
   cfg.soundDirs       = sources.getSoundDirs();