diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index 12226a0fa..000000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: "CodeQL"
-
-on:
-  pull_request:
-    paths:
-      - "**.go"
-  push:
-    # The branches below must be a subset of the branches above
-    branches:
-      - main
-      - release/**
-    paths:
-      - "**.go"
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "1.22"
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: "go"
-          queries: crypto-com/cosmos-sdk-codeql@main,security-and-quality
-
-      - name: Build
-        run: make build
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
diff --git a/block/fork.go b/block/fork.go
index 0f909dff8..b100faeab 100644
--- a/block/fork.go
+++ b/block/fork.go
@@ -64,8 +64,8 @@ func (m *Manager) checkForkUpdate(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		err := fmt.Errorf("fork update")
-		m.freezeNode(ctx, err)
+
+		m.freezeNode(ctx, fmt.Errorf("fork update detected"))
 	}
 
 	return nil
diff --git a/mocks/github.com/dymensionxyz/dymint/store/mock_Store.go b/mocks/github.com/dymensionxyz/dymint/store/mock_Store.go
index 5cb0aee0f..451e7b03f 100644
--- a/mocks/github.com/dymensionxyz/dymint/store/mock_Store.go
+++ b/mocks/github.com/dymensionxyz/dymint/store/mock_Store.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.42.3. DO NOT EDIT.
+// Code generated by mockery v2.43.0. DO NOT EDIT.
 
 package store
 
diff --git a/types/serialization.go b/types/serialization.go
index 8f3181cd6..1ae6baa9b 100644
--- a/types/serialization.go
+++ b/types/serialization.go
@@ -295,6 +295,7 @@ func (s *State) FromProto(other *pb.State) error {
 
 	s.ConsensusParams = other.ConsensusParams
 	copy(s.LastResultsHash[:], other.LastResultsHash)
+	copy(s.LastHeaderHash[:], other.LastHeaderHash)
 	copy(s.AppHash[:], other.AppHash)
 	s.RollappParams = other.RollappParams
 	return nil