diff --git a/clientapi/routing/room_hierarchy.go b/clientapi/routing/room_hierarchy.go
index a1c2a610a..e314d07c8 100644
--- a/clientapi/routing/room_hierarchy.go
+++ b/clientapi/routing/room_hierarchy.go
@@ -92,7 +92,8 @@ func QueryRoomHierarchy(req *http.Request, device *userapi.Device, roomIDStr str
 	limit := 1000 // Default to 1000
 	limitStr := req.URL.Query().Get("limit")
 	if limitStr != "" {
-		maybeLimit, err := strconv.Atoi(limitStr)
+		var maybeLimit int
+		maybeLimit, err = strconv.Atoi(limitStr)
 		if err != nil || maybeLimit < 0 {
 			return util.JSONResponse{
 				Code: http.StatusBadRequest,
@@ -108,7 +109,8 @@ func QueryRoomHierarchy(req *http.Request, device *userapi.Device, roomIDStr str
 	maxDepth := -1 // '-1' representing no maximum depth
 	maxDepthStr := req.URL.Query().Get("max_depth")
 	if maxDepthStr != "" {
-		maybeMaxDepth, err := strconv.Atoi(maxDepthStr)
+		var maybeMaxDepth int
+		maybeMaxDepth, err = strconv.Atoi(maxDepthStr)
 		if err != nil || maybeMaxDepth < 0 {
 			return util.JSONResponse{
 				Code: http.StatusBadRequest,
diff --git a/roomserver/api/query.go b/roomserver/api/query.go
index c3d6c303b..57bac2df9 100644
--- a/roomserver/api/query.go
+++ b/roomserver/api/query.go
@@ -574,7 +574,7 @@ func (s RoomSet) Add(val spec.RoomID) {
 
 func (s RoomSet) Copy() RoomSet {
 	copied := make(RoomSet, len(s))
-	for k, _ := range s {
+	for k := range s {
 		copied.Add(k)
 	}
 	return copied