diff --git a/agora-scripts/Cache.hs b/agora-scripts/Cache.hs
deleted file mode 100644
index bfbad91..0000000
--- a/agora-scripts/Cache.hs
+++ /dev/null
@@ -1 +0,0 @@
-module Cache where
diff --git a/agora-scripts/Options.hs b/agora-scripts/Options.hs
index 4187a1d..b0fa855 100644
--- a/agora-scripts/Options.hs
+++ b/agora-scripts/Options.hs
@@ -11,7 +11,7 @@ import Network.Wai.Handler.Warp qualified as Warp
 import Options.Applicative ((<**>))
 import Options.Applicative qualified as Opt
 
-data Options = Options
+newtype Options = Options
   { port :: Warp.Port
   }
   deriving stock (Show, Eq)
diff --git a/agora.cabal b/agora.cabal
index 8dd8e27..83d3189 100644
--- a/agora.cabal
+++ b/agora.cabal
@@ -12,11 +12,11 @@ license:            Apache-2.0
 
 common lang
   ghc-options:
-    -Wall -Wcompat -Wincomplete-uni-patterns -Wno-unused-do-bind
-    -Wno-partial-type-signatures -Wmissing-export-lists
-    -Wincomplete-record-updates -Wmissing-deriving-strategies
-    -Wno-name-shadowing -Wunused-foralls -fprint-explicit-foralls
-    -fprint-explicit-kinds -Werror
+    -Werror -Wall -Wcompat -Wincomplete-uni-patterns
+    -Wno-unused-do-bind -Wno-partial-type-signatures
+    -Wmissing-export-lists -Wincomplete-record-updates
+    -Wmissing-deriving-strategies -Wno-name-shadowing -Wunused-foralls
+    -fprint-explicit-foralls -fprint-explicit-kinds
 
   mixins:
     base hiding (Prelude),
@@ -28,7 +28,6 @@ common lang
     BinaryLiterals
     ConstrainedClassMethods
     ConstraintKinds
-    DuplicateRecordFields
     DataKinds
     DeriveAnyClass
     DeriveDataTypeable
@@ -40,6 +39,7 @@ common lang
     DerivingStrategies
     DerivingVia
     DoAndIfThenElse
+    DuplicateRecordFields
     EmptyCase
     EmptyDataDecls
     EmptyDataDeriving
@@ -138,6 +138,7 @@ common exe-opts
 library
   import:          lang, deps
   exposed-modules:
+    Agora.Aeson.Orphans
     Agora.AuthorityToken
     Agora.Effect
     Agora.Effect.GovernorMutation
@@ -146,6 +147,7 @@ library
     Agora.Governor
     Agora.Governor.Scripts
     Agora.MultiSig
+    Agora.Plutarch.Orphans
     Agora.Proposal
     Agora.Proposal.Scripts
     Agora.Proposal.Time
@@ -157,9 +159,6 @@ library
     Agora.Utils
 
   other-modules:
-    Agora.Aeson.Orphans
-    Agora.Plutarch.Orphans
-
   hs-source-dirs:  agora
 
 library pprelude
@@ -246,6 +245,7 @@ executable agora-scripts
     , agora
     , cache
     , clock
+    , containers
     , gitrev
     , hashable
     , http-types
@@ -256,7 +256,6 @@ executable agora-scripts
     , wai
     , wai-cors
     , warp
-    , containers
 
 executable agora-purescript-bridge
   import:         lang, deps, exe-opts
diff --git a/agora/Agora/ScriptInfo.hs b/agora/Agora/ScriptInfo.hs
index 4942654..698c9c5 100644
--- a/agora/Agora/ScriptInfo.hs
+++ b/agora/Agora/ScriptInfo.hs
@@ -20,7 +20,14 @@ import Agora.Aeson.Orphans ()
 import Data.Aeson qualified as Aeson
 import GHC.Generics qualified as GHC
 import Plutarch.Api.V1 (PMintingPolicy, PValidator, mintingPolicySymbol, mkMintingPolicy, mkValidator, validatorHash)
-import PlutusLedgerApi.V1 (BuiltinByteString, CurrencySymbol (unCurrencySymbol), MintingPolicy, Script, Validator, ValidatorHash, unMintingPolicyScript)
+import PlutusLedgerApi.V1 (
+  BuiltinByteString,
+  CurrencySymbol,
+  MintingPolicy,
+  Script,
+  Validator,
+  ValidatorHash,
+ )
 
 -- | Bundle containing a 'Script' and its hash.
 data ScriptInfo = ScriptInfo