diff --git a/account.cpp b/account.cpp
index 246df14..ced9a57 100644
--- a/account.cpp
+++ b/account.cpp
@@ -150,7 +150,7 @@ bool weechat::account::search_device(weechat::account::device* out, std::uint32_
     }
 
     (void) out;
-    return NULL;
+    return false;
 }
 
 void weechat::account::add_device(weechat::account::device *device)
diff --git a/channel.cpp b/channel.cpp
index cf56f18..bb2bd56 100644
--- a/channel.cpp
+++ b/channel.cpp
@@ -249,7 +249,7 @@ weechat::channel::channel(weechat::account& account,
         struct tm *ago = gmtime(&start);
         ago->tm_mday -= 7;
         start = mktime(ago);
-        fetch_mam(nullptr, &start, nullptr, nullptr);
+        fetch_mam(id, &start, nullptr, nullptr);
     }
 }