diff --git a/hugolib/pageGroup.go b/hugolib/pageGroup.go
index 3ccd35a06..00b8e278a 100644
--- a/hugolib/pageGroup.go
+++ b/hugolib/pageGroup.go
@@ -142,9 +142,10 @@ func (p Pages) GroupBy(key string, order ...string) (PagesGroup, error) {
 		tmp.SetMapIndex(fv, reflect.Append(tmp.MapIndex(fv), ppv))
 	}
 
-	var r []PageGroup
-	for _, k := range sortKeys(tmp.MapKeys(), direction) {
-		r = append(r, PageGroup{Key: k.Interface(), Pages: tmp.MapIndex(k).Interface().([]*Page)})
+	sortedKeys := sortKeys(tmp.MapKeys(), direction)
+	r := make([]PageGroup, len(sortedKeys))
+	for i, k := range sortedKeys {
+		r[i] = PageGroup{Key: k.Interface(), Pages: tmp.MapIndex(k).Interface().([]*Page)}
 	}
 
 	return r, nil
diff --git a/hugolib/page_collections.go b/hugolib/page_collections.go
index e72f9a731..1eda67b19 100644
--- a/hugolib/page_collections.go
+++ b/hugolib/page_collections.go
@@ -76,10 +76,10 @@ func (c *PageCollections) refreshPageCaches() {
 		}
 	}
 
-	var partitions []cache.Partition
+	partitions := make([]cache.Partition, len(allKindsInPages))
 
-	for _, kind := range allKindsInPages {
-		partitions = append(partitions, cache.Partition{Key: kind, Load: cacheLoader(kind)})
+	for i, kind := range allKindsInPages {
+		partitions[i] = cache.Partition{Key: kind, Load: cacheLoader(kind)}
 	}
 
 	c.pageCache = cache.NewPartitionedLazyCache(partitions...)