diff --git a/v2/cmd/wails/internal/commands/build/build.go b/v2/cmd/wails/internal/commands/build/build.go
index ae8ef299..705e693c 100644
--- a/v2/cmd/wails/internal/commands/build/build.go
+++ b/v2/cmd/wails/internal/commands/build/build.go
@@ -43,7 +43,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 
 	// Quiet Build
 	quiet := false
-	command.BoolFlag("q", "Supress output to console", &quiet)
+	command.BoolFlag("q", "Suppress output to console", &quiet)
 
 	// ldflags to pass to `go`
 	ldflags := ""
diff --git a/v2/pkg/commands/build/base.go b/v2/pkg/commands/build/base.go
index abb149e7..e7233e10 100644
--- a/v2/pkg/commands/build/base.go
+++ b/v2/pkg/commands/build/base.go
@@ -311,7 +311,10 @@ func (b *BaseBuilder) NpmRunWithEnvironment(projectDir, buildTarget string, verb
 }
 
 // BuildFrontend executes the `npm build` command for the frontend directory
-func (b *BaseBuilder) BuildFrontend(outputLogger *clilogger.CLILogger, verbose bool) error {
+func (b *BaseBuilder) BuildFrontend(outputLogger *clilogger.CLILogger) error {
+
+	// TODO: Fix this up from the CLI
+	verbose := false
 
 	frontendDir := filepath.Join(b.projectData.Path, "frontend")
 
diff --git a/v2/pkg/commands/build/hybrid.go b/v2/pkg/commands/build/hybrid.go
index 5c1cc086..a5a059b9 100644
--- a/v2/pkg/commands/build/hybrid.go
+++ b/v2/pkg/commands/build/hybrid.go
@@ -2,6 +2,7 @@ package build
 
 import (
 	"github.com/wailsapp/wails/v2/internal/project"
+	"github.com/wailsapp/wails/v2/pkg/clilogger"
 )
 
 // HybridBuilder builds applications as a server
@@ -30,7 +31,7 @@ func (b *HybridBuilder) BuildAssets(options *Options) error {
 		return err
 	}
 	// Build static assets
-	err = b.buildStaticAssets(b.projectData)
+	err = b.buildCustomAssets(b.projectData)
 	if err != nil {
 		return err
 	}
@@ -38,6 +39,12 @@ func (b *HybridBuilder) BuildAssets(options *Options) error {
 	return nil
 }
 
+// BuildFrontend builds the assets for the desktop application
+func (b *HybridBuilder) BuildFrontend(_ *clilogger.CLILogger) error {
+	panic("To be implemented")
+	return nil
+}
+
 // BuildAssets builds the assets for the desktop application
 func (b *HybridBuilder) BuildBaseAssets(options *Options) error {
 
@@ -57,13 +64,13 @@ func (b *HybridBuilder) BuildBaseAssets(options *Options) error {
 	}
 
 	// Build desktop static assets
-	err = b.desktop.buildStaticAssets(b.projectData)
+	err = b.desktop.buildCustomAssets(b.projectData)
 	if err != nil {
 		return err
 	}
 
 	// Build server static assets
-	err = b.server.buildStaticAssets(b.projectData)
+	err = b.server.buildCustomAssets(b.projectData)
 	if err != nil {
 		return err
 	}
diff --git a/v2/pkg/commands/build/server.go b/v2/pkg/commands/build/server.go
index 2047e74d..44ff1a97 100644
--- a/v2/pkg/commands/build/server.go
+++ b/v2/pkg/commands/build/server.go
@@ -23,7 +23,7 @@ func newServerBuilder() *ServerBuilder {
 }
 
 // BuildAssets builds the assets for the desktop application
-func (s *ServerBuilder) BuildAssets(options *Options) error {
+func (s *ServerBuilder) BuildAssets(_ *Options) error {
 	var err error
 
 	assets, err := s.BaseBuilder.ExtractAssets()
@@ -38,7 +38,7 @@ func (s *ServerBuilder) BuildAssets(options *Options) error {
 	}
 
 	// Build static assets
-	err = s.buildStaticAssets(s.projectData)
+	err = s.buildCustomAssets(s.projectData)
 	if err != nil {
 		return err
 	}
@@ -84,11 +84,14 @@ func (s *ServerBuilder) BuildBaseAssets(assets *html.AssetBundle) error {
 	if err != nil {
 		return err
 	}
-	defer f.Close()
 
-	f.WriteString(db.Serialize("db", "webserver"))
-
-	return nil
+	_, err = f.WriteString(db.Serialize("db", "webserver"))
+	if err != nil {
+		// Ignore error - we already have one!
+		_ = f.Close()
+		return err
+	}
+	return f.Close()
 }
 
 // BuildRuntime builds the javascript runtime used by the HTML client to connect to the websocket