diff --git a/src/librssguard/database/sqlitedriver.cpp b/src/librssguard/database/sqlitedriver.cpp
index 8980f402e..165260591 100755
--- a/src/librssguard/database/sqlitedriver.cpp
+++ b/src/librssguard/database/sqlitedriver.cpp
@@ -17,7 +17,7 @@ SqliteDriver::SqliteDriver(bool in_memory, QObject* parent)
   m_inMemoryDatabaseInitialized(false) {}
 
 QString SqliteDriver::location() const {
-  return m_databaseFilePath;
+  return QDir::toNativeSeparators(m_databaseFilePath);
 }
 
 DatabaseDriver::DriverType SqliteDriver::driverType() const {
diff --git a/src/librssguard/gui/feedsview.cpp b/src/librssguard/gui/feedsview.cpp
index 7be3c7f1a..4198bac7a 100755
--- a/src/librssguard/gui/feedsview.cpp
+++ b/src/librssguard/gui/feedsview.cpp
@@ -96,7 +96,9 @@ void FeedsView::saveAllExpandStates() {
 
 void FeedsView::saveExpandStates(RootItem* item) {
   Settings* settings = qApp->settings();
-  QList<RootItem*> items = item->getSubTree(RootItem::Kind::Category | RootItem::Kind::ServiceRoot);
+  QList<RootItem*> items = item->getSubTree(RootItem::Kind::Category |
+                                            RootItem::Kind::ServiceRoot |
+                                            RootItem::Kind::Labels);
 
   // Iterate all categories and save their expand statuses.
   for (const RootItem* it : items) {
@@ -114,7 +116,9 @@ void FeedsView::loadAllExpandStates() {
   const Settings* settings = qApp->settings();
   QList<RootItem*> expandable_items;
 
-  expandable_items.append(sourceModel()->rootItem()->getSubTree(RootItem::Kind::Category | RootItem::Kind::ServiceRoot));
+  expandable_items.append(sourceModel()->rootItem()->getSubTree(RootItem::Kind::Category |
+                                                                RootItem::Kind::ServiceRoot |
+                                                                RootItem::Kind::Labels));
 
   // Iterate all categories and save their expand statuses.
   for (const RootItem* item : expandable_items) {
diff --git a/src/librssguard/services/gmail/gmailserviceroot.cpp b/src/librssguard/services/gmail/gmailserviceroot.cpp
index 32a43c48a..29d31290b 100644
--- a/src/librssguard/services/gmail/gmailserviceroot.cpp
+++ b/src/librssguard/services/gmail/gmailserviceroot.cpp
@@ -176,7 +176,7 @@ void GmailServiceRoot::start(bool freshly_activated) {
   auto chi = childItems();
 
   for (RootItem* feed : qAsConst(chi)) {
-    if (feed->customId() == QL1S("INBOX")) {
+    if (feed->customId() == QL1S(GMAIL_SYSTEM_LABEL_INBOX)) {
       feed->setKeepOnTop(true);
     }
   }