diff --git a/middleware/gzip/gzip.go b/middleware/gzip/gzip.go
index 35d29e6f..69411832 100644
--- a/middleware/gzip/gzip.go
+++ b/middleware/gzip/gzip.go
@@ -33,7 +33,9 @@ func (g Gzip) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
 		return g.Next.ServeHTTP(w, r)
 	}
 
-	r.Header.Del("Accept-Encoding") // Removes header to prevent double encoding by ambitious fastcgi implementations
+	// Delete this header so gzipping isn't repeated later in the chain
+	r.Header.Del("Accept-Encoding")
+
 	w.Header().Set("Content-Encoding", "gzip")
 	gzipWriter := gzip.NewWriter(w)
 	defer gzipWriter.Close()
diff --git a/middleware/websockets/websockets.go b/middleware/websockets/websockets.go
index c1f235de..561d84d6 100644
--- a/middleware/websockets/websockets.go
+++ b/middleware/websockets/websockets.go
@@ -130,5 +130,5 @@ var (
 
 const (
 	envGatewayInterface = "caddy-CGI/1.1"
-	envServerSoftware   = "caddy/?.?.?" // TODO
+	envServerSoftware   = "caddy/" // TODO: Version
 )
diff --git a/server/server.go b/server/server.go
index 1f9d40e3..028278b0 100644
--- a/server/server.go
+++ b/server/server.go
@@ -162,6 +162,8 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if vh, ok := s.vhosts[host]; ok {
+		w.Header().Set("Server", "Caddy")
+
 		status, _ := vh.stack.ServeHTTP(w, r)
 
 		// Fallback error response in case error handling wasn't chained in