diff --git a/app/browserforwarder/forwarder.go b/app/browserforwarder/forwarder.go
index a2f17f2f8..54dbe136f 100644
--- a/app/browserforwarder/forwarder.go
+++ b/app/browserforwarder/forwarder.go
@@ -37,7 +37,6 @@ func (f *Forwarder) ServeHTTP(writer http.ResponseWriter, request *http.Request)
 		fallthrough
 	case "index.js":
 		BridgeResource(writer, request, requestPath)
-		break
 	case "link":
 		f.forwarder.ServeBridge(writer, request)
 	}
@@ -83,7 +82,7 @@ func BridgeResource(rw http.ResponseWriter, r *http.Request, path string) {
 	data, err := securedload.GetAssetSecured("browserforwarder/" + content)
 	if err != nil {
 		err = newError("cannot load necessary resources").Base(err)
-		http.Error(rw, err.Error(), 403)
+		http.Error(rw, err.Error(), http.StatusForbidden)
 		return
 	}
 
diff --git a/common/platform/securedload/embeddedhash.go b/common/platform/securedload/embeddedhash.go
index 3f1f0a2e7..da5419dc3 100644
--- a/common/platform/securedload/embeddedhash.go
+++ b/common/platform/securedload/embeddedhash.go
@@ -30,7 +30,6 @@ func (e EmbeddedHashProtectedLoader) VerifyAndLoad(filename string) ([]byte, err
 				return filecontent, nil
 			}
 		}
-
 	}
 	return nil, newError("Unrecognized file at ", filename, " can not be loaded for execution")
 }
diff --git a/common/platform/securedload/file.go b/common/platform/securedload/file.go
index 2a5b64e6f..1d8705064 100644
--- a/common/platform/securedload/file.go
+++ b/common/platform/securedload/file.go
@@ -3,16 +3,15 @@ package securedload
 import "path/filepath"
 
 func GetAssetSecured(name string) ([]byte, error) {
-
 	name = filepath.FromSlash(name)
 
 	var err error
 	for k, v := range knownProtectedLoader {
-		if loadedData, errLoad := v.VerifyAndLoad(name); errLoad == nil {
+		loadedData, errLoad := v.VerifyAndLoad(name)
+		if errLoad == nil {
 			return loadedData, nil
-		} else {
-			err = newError(k, " is not loading executable file").Base(errLoad)
 		}
+		err = newError(k, " is not loading executable file").Base(errLoad)
 	}
 	return nil, err
 }
diff --git a/transport/internet/websocket/dialer.go b/transport/internet/websocket/dialer.go
index f46e5bbd5..93da25fce 100644
--- a/transport/internet/websocket/dialer.go
+++ b/transport/internet/websocket/dialer.go
@@ -124,7 +124,7 @@ func (d dialerWithEarlyData) Dial(earlyData []byte) (*websocket.Conn, error) {
 		return nil, newError("websocket delayed dialer cannot encode early data tail").Base(errc)
 	}
 
-	conn, resp, err := d.dialer.Dial(d.uriBase+string(earlyDataBuf.Bytes()), d.config.GetRequestHeader())
+	conn, resp, err := d.dialer.Dial(d.uriBase+earlyDataBuf.String(), d.config.GetRequestHeader())
 	if err != nil {
 		var reason string
 		if resp != nil {
@@ -161,7 +161,7 @@ func (d dialerWithEarlyDataRelayed) Dial(earlyData []byte) (io.ReadWriteCloser,
 		return nil, newError("websocket delayed dialer cannot encode early data tail").Base(errc)
 	}
 
-	conn, err := d.forwarder.DialWebsocket(d.uriBase+string(earlyDataBuf.Bytes()), d.config.GetRequestHeader())
+	conn, err := d.forwarder.DialWebsocket(d.uriBase+earlyDataBuf.String(), d.config.GetRequestHeader())
 	if err != nil {
 		var reason string
 		return nil, newError("failed to dial to (", d.uriBase, ") with early data: ", reason).Base(err)