diff --git a/mediaapi/routing/download.go b/mediaapi/routing/download.go
index 412faceb30..1ab2dfb28c 100644
--- a/mediaapi/routing/download.go
+++ b/mediaapi/routing/download.go
@@ -342,6 +342,7 @@ func (r *downloadRequest) addDownloadFilenameToHeaders(
 	}
 
 	if len(filename) == 0 {
+		w.Header().Set("Content-Disposition", "attachment")
 		return nil
 	}
 
@@ -377,13 +378,13 @@ func (r *downloadRequest) addDownloadFilenameToHeaders(
 		// that would otherwise be parsed as a control character in the
 		// Content-Disposition header
 		w.Header().Set("Content-Disposition", fmt.Sprintf(
-			`inline; filename=%s%s%s`,
+			`attachment; filename=%s%s%s`,
 			quote, unescaped, quote,
 		))
 	} else {
 		// For UTF-8 filenames, we quote always, as that's the standard
 		w.Header().Set("Content-Disposition", fmt.Sprintf(
-			`inline; filename*=utf-8''%s`,
+			`attachment; filename*=utf-8''%s`,
 			url.QueryEscape(unescaped),
 		))
 	}
diff --git a/roomserver/internal/perform/perform_peek.go b/roomserver/internal/perform/perform_peek.go
index 436d137ff7..8a7a910349 100644
--- a/roomserver/internal/perform/perform_peek.go
+++ b/roomserver/internal/perform/perform_peek.go
@@ -185,7 +185,7 @@ func (r *Peeker) performPeekRoomByID(
 		content := map[string]string{}
 		if err = json.Unmarshal(ev.Content(), &content); err != nil {
 			util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for history visibility failed")
-			return
+			return "", err
 		}
 		if visibility, ok := content["history_visibility"]; ok {
 			worldReadable = visibility == "world_readable"
@@ -219,7 +219,7 @@ func (r *Peeker) performPeekRoomByID(
 		},
 	})
 	if err != nil {
-		return
+		return "", err
 	}
 
 	// By this point, if req.RoomIDOrAlias contained an alias, then
diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go
index 3c41662728..036178b700 100644
--- a/syncapi/routing/messages.go
+++ b/syncapi/routing/messages.go
@@ -295,11 +295,12 @@ func (r *messagesReq) retrieveEvents() (
 	clientEvents []synctypes.ClientEvent, start,
 	end types.TopologyToken, err error,
 ) {
+	emptyToken := types.TopologyToken{}
 	// Retrieve the events from the local database.
 	streamEvents, err := r.snapshot.GetEventsInTopologicalRange(r.ctx, r.from, r.to, r.roomID, r.filter, r.backwardOrdering)
 	if err != nil {
 		err = fmt.Errorf("GetEventsInRange: %w", err)
-		return
+		return []synctypes.ClientEvent{}, emptyToken, emptyToken, err
 	}
 
 	var events []*gomatrixserverlib.HeaderedEvent
@@ -314,11 +315,11 @@ func (r *messagesReq) retrieveEvents() (
 	// on the ordering), or we've reached a backward extremity.
 	if len(streamEvents) == 0 {
 		if events, err = r.handleEmptyEventsSlice(); err != nil {
-			return
+			return []synctypes.ClientEvent{}, emptyToken, emptyToken, err
 		}
 	} else {
 		if events, err = r.handleNonEmptyEventsSlice(streamEvents); err != nil {
-			return
+			return []synctypes.ClientEvent{}, emptyToken, emptyToken, err
 		}
 	}
 
diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go
index f086bb0c65..cf014714a9 100644
--- a/syncapi/streams/stream_pdu.go
+++ b/syncapi/streams/stream_pdu.go
@@ -481,7 +481,7 @@ func (p *PDUStreamProvider) getJoinResponseForCompleteSync(
 
 	stateEvents, err := snapshot.CurrentState(ctx, roomID, stateFilter, excludingEventIDs)
 	if err != nil {
-		return
+		return jr, err
 	}
 
 	jr.Summary, err = snapshot.GetRoomSummary(ctx, roomID, device.UserID)
@@ -534,7 +534,7 @@ func (p *PDUStreamProvider) getJoinResponseForCompleteSync(
 		}
 		backwardTopologyPos, backwardStreamPos, err = snapshot.PositionInTopology(ctx, event.EventID())
 		if err != nil {
-			return
+			return jr, err
 		}
 		prevBatch = &types.TopologyToken{
 			Depth:       backwardTopologyPos,
diff --git a/userapi/storage/shared/storage.go b/userapi/storage/shared/storage.go
index 0552496479..742cdccfb7 100644
--- a/userapi/storage/shared/storage.go
+++ b/userapi/storage/shared/storage.go
@@ -642,7 +642,7 @@ func (d *Database) CreateDevice(
 		for i := 1; i <= 5; i++ {
 			newDeviceID, returnErr = generateDeviceID()
 			if returnErr != nil {
-				return
+				return nil, returnErr
 			}
 
 			returnErr = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
@@ -651,7 +651,7 @@ func (d *Database) CreateDevice(
 				return err
 			})
 			if returnErr == nil {
-				return
+				return dev, nil
 			}
 		}
 	}