diff --git a/module-apps/UiCommonActions.cpp b/module-apps/UiCommonActions.cpp
index a1618c7da..46a7bab98 100644
--- a/module-apps/UiCommonActions.cpp
+++ b/module-apps/UiCommonActions.cpp
@@ -72,7 +72,7 @@ namespace app
 
     bool contact(Application *app, ContactOperation contactOperation, const ContactRecord &contact)
     {
-        auto data = std::make_unique<PhonebookItemData>(std::shared_ptr<ContactRecord>(new ContactRecord(contact)));
+        auto data             = std::make_unique<PhonebookItemData>(std::make_shared<ContactRecord>(contact));
         data->disableAppClose = true;
         assert(app != nullptr);
         switch (contactOperation) {
diff --git a/module-apps/application-messages/windows/ThreadViewWindow.cpp b/module-apps/application-messages/windows/ThreadViewWindow.cpp
index d9d333923..a2ca34d41 100644
--- a/module-apps/application-messages/windows/ThreadViewWindow.cpp
+++ b/module-apps/application-messages/windows/ThreadViewWindow.cpp
@@ -146,7 +146,7 @@ namespace gui
         }
         SMS.dbsize = threadDetails->msgCount;
 
-        if (threadDetails != nullptr && threadDetails->isUnread()) {
+        if (threadDetails->isUnread()) {
             auto app = dynamic_cast<app::ApplicationMessages *>(application);
             assert(app != nullptr);
             if (application->getCurrentWindow() == this) {
diff --git a/module-db/Interface/ThreadRecord.cpp b/module-db/Interface/ThreadRecord.cpp
index 0f163e827..fcf06cb09 100644
--- a/module-db/Interface/ThreadRecord.cpp
+++ b/module-db/Interface/ThreadRecord.cpp
@@ -23,7 +23,7 @@ bool ThreadRecordInterface::Add(const ThreadRecord &rec)
 
 bool ThreadRecordInterface::RemoveByID(uint32_t id)
 {
-    auto ret = smsDB->threads.removeByID(id);
+    auto ret = smsDB->threads.removeById(id);
     if (ret == false) {
         return false;
     }