diff --git a/include/libQuotient b/include/libQuotient
index 58dfe7439..55d8d9c07 160000
--- a/include/libQuotient
+++ b/include/libQuotient
@@ -1 +1 @@
-Subproject commit 58dfe74390ebdd8ec6611d3b8fecfe7d051ff955
+Subproject commit 55d8d9c073b732e296c72bc8a747bbd691931209
diff --git a/src/publicroomlistmodel.cpp b/src/publicroomlistmodel.cpp
index e8bc0d317..29ff97d4d 100644
--- a/src/publicroomlistmodel.cpp
+++ b/src/publicroomlistmodel.cpp
@@ -110,15 +110,14 @@ void PublicRoomListModel::next(int count) {
     attempted = true;
 
     if (job->status() == BaseJob::Success) {
-      auto resp = job->data();
-      nextBatch = resp.nextBatch;
+      nextBatch = job->nextBatch();
 
       this->beginInsertRows({}, rooms.count(),
-                            rooms.count() + resp.chunk.count() - 1);
-      rooms.append(resp.chunk);
+                            rooms.count() + job->chunk().count() - 1);
+      rooms.append(job->chunk());
       this->endInsertRows();
 
-      if (resp.nextBatch.isEmpty()) {
+      if (job->nextBatch().isEmpty()) {
         emit hasMoreChanged();
       }
     }
diff --git a/src/spectralroom.cpp b/src/spectralroom.cpp
index 3c4e58d9b..5ee909a9e 100644
--- a/src/spectralroom.cpp
+++ b/src/spectralroom.cpp
@@ -397,30 +397,30 @@ void SpectralRoom::changeAvatar(QUrl localFile) {
   const auto job = connection()->uploadFile(localFile.toLocalFile());
   if (isJobRunning(job)) {
     connect(job, &BaseJob::success, this, [this, job] {
-      connection()->callApi<SetRoomStateJob>(
-          id(), "m.room.avatar", QJsonObject{{"url", job->contentUri()}});
+      connection()->callApi<SetRoomStateWithKeyJob>(
+          id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri()}});
     });
   }
 }
 
 void SpectralRoom::addLocalAlias(const QString& alias) {
-  auto aliases = localAliases();
-  if (aliases.contains(alias))
+  auto a = aliases();
+  if (a.contains(alias))
     return;
 
-  aliases += alias;
+  a += alias;
 
-  setLocalAliases(aliases);
+  setLocalAliases(a);
 }
 
 void SpectralRoom::removeLocalAlias(const QString& alias) {
-  auto aliases = localAliases();
-  if (!aliases.contains(alias))
+  auto a = aliases();
+  if (!a.contains(alias))
     return;
 
-  aliases.removeAll(alias);
+  a.removeAll(alias);
 
-  setLocalAliases(aliases);
+  setLocalAliases(a);
 }
 
 QString SpectralRoom::markdownToHTML(const QString& markdown) {