diff --git a/modules/circuitbreaker/circuitbreaker.go b/modules/circuitbreaker/circuitbreaker.go
index 7323ab25a4..1366f717d9 100644
--- a/modules/circuitbreaker/circuitbreaker.go
+++ b/modules/circuitbreaker/circuitbreaker.go
@@ -281,7 +281,7 @@ type Stats struct {
 	State           string    `json:"state"`
 	Failures        int       `json:"failures"`
 	Successes       int       `json:"successes"`
-	LastFailure     time.Time `json:"last_failure,omitempty"`
+	LastFailure     time.Time `json:"last_failure,omitzero"`
 	LastStateChange time.Time `json:"last_state_change"`
 	Generation      uint64    `json:"generation"`
 }
diff --git a/modules/operations/progress.go b/modules/operations/progress.go
index 9a1e75cfcc..9236263a19 100644
--- a/modules/operations/progress.go
+++ b/modules/operations/progress.go
@@ -7,12 +7,13 @@ package operations
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
+	"maps"
 	"net/http"
 	"sync"
 	"time"
 
+	"code.gitea.io/gitea/modules/json"
 	"code.gitea.io/gitea/modules/log"
 )
 
@@ -354,11 +355,7 @@ func (op *Operation) Complete(result map[string]any) {
 		op.phases[i].Status = StatusComplete
 		op.phases[i].Progress = 100
 	}
-	if result != nil {
-		for k, v := range result {
-			op.metadata[k] = v
-		}
-	}
+	maps.Copy(op.metadata, result)
 	op.updatedAt = time.Now()
 	op.mu.Unlock()
 	op.broadcast()
diff --git a/modules/structs/repo_pages.go b/modules/structs/repo_pages.go
index 583d5f3ba4..75d6dde967 100644
--- a/modules/structs/repo_pages.go
+++ b/modules/structs/repo_pages.go
@@ -22,7 +22,7 @@ type PagesDomain struct {
 	SSLStatus         string    `json:"ssl_status"`
 	SSLCertExpiry     time.Time `json:"ssl_cert_expiry,omitzero"`
 	Created           time.Time `json:"created_at"`
-	VerifiedAt        time.Time `json:"verified_at,omitempty"`
+	VerifiedAt        time.Time `json:"verified_at,omitzero"`
 }
 
 // CreatePagesConfigOption options for creating/updating pages config
diff --git a/routers/api/v1/repo/pages.go b/routers/api/v1/repo/pages.go
index c37a119bea..c78f51d1ad 100644
--- a/routers/api/v1/repo/pages.go
+++ b/routers/api/v1/repo/pages.go
@@ -374,7 +374,7 @@ func convertPagesDomain(domain *repo_model.PagesDomain) *api.PagesDomain {
 		SSLStatus:         string(domain.SSLStatus),
 		SSLCertExpiry:     domain.SSLCertExpiry.AsTime(),
 		Created:           domain.CreatedUnix.AsTime(),
-		Verified_At:       domain.VerifiedUnix.AsTime(),
+		VerifiedAt:        domain.VerifiedUnix.AsTime(),
 	}
 }