diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
index c15d66a332..b4a5db11a0 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/geth/chaincmd.go
@@ -438,7 +438,7 @@ func exportPreimages(ctx *cli.Context) error {
 	stack, _ := makeConfigNode(ctx)
 	defer stack.Close()
 
-	db := utils.MakeChainDatabase(ctx, stack, true)
+	db := utils.MakeChainDatabase(ctx, stack, true, false)
 	defer db.Close()
 	start := time.Now()
 
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 8c12da79f5..ea7f3ad645 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -287,6 +287,8 @@ func main() {
 // prepare manipulates memory cache allowance and setups metric system.
 // This function should be called before launching devp2p stack.
 func prepare(ctx *cli.Context) {
+	const light = "light"
+
 	// If we're running a known preset, log it for convenience.
 	switch {
 	case ctx.IsSet(utils.GoerliFlag.Name):