diff --git a/src/base_page.c b/src/base_page.c
index f51403f..4504922 100644
--- a/src/base_page.c
+++ b/src/base_page.c
@@ -65,7 +65,7 @@ void render_base_page(struct base_page* page, struct session* ssn, mastodont_t*
         };
         
         if (mastodont_get_notifications(api, &args, &storage, &notifs, &notifs_len) == 0)
-            sidebar_str = construct_notifications_compact(notifs, notifs_len, NULL);
+            sidebar_str = construct_notifications_compact(api, notifs, notifs_len, NULL);
 
         mstdnt_cleanup_notifications(notifs, notifs_len);
     }
diff --git a/src/status.c b/src/status.c
index 9674dc5..ff068c1 100644
--- a/src/status.c
+++ b/src/status.c
@@ -134,9 +134,11 @@ char* construct_in_reply_to(mastodont_t* api, struct mstdnt_status* status, size
                   config_url_prefix,
                   status->in_reply_to_id,
                   L10N[L10N_EN_US][L10N_IN_REPLY_TO],
-                  status->in_reply_to_account_id);
+                  acct.acct);
     
     if (size) *size = s;
+
+    mastodont_storage_cleanup(&storage);
     return irt_html;
 }
 
diff --git a/static/in_reply_to.html b/static/in_reply_to.html
index cd8e744..87698bd 100644
--- a/static/in_reply_to.html
+++ b/static/in_reply_to.html
@@ -1,3 +1,3 @@
 <span class="in-reply-to">
-  <a class="in-reply-to-id" href="%s/status/%s"><span class="in-reply-to-text">%s</span></a> <span class="acct">%s</span>
+  <a class="in-reply-to-id" href="%s/status/%s"><span class="in-reply-to-text">%s</span> <span class="acct">%s</span></a>
 </span>