diff --git a/appservice/storage/storage.go b/appservice/storage/storage.go
index b0df2b7dc2..97b8501e23 100644
--- a/appservice/storage/storage.go
+++ b/appservice/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/clientapi/auth/password.go b/clientapi/auth/password.go
index 08edc4fab0..3ce0c3fe0e 100644
--- a/clientapi/auth/password.go
+++ b/clientapi/auth/password.go
@@ -26,6 +26,8 @@ import (
 	"github.com/matrix-org/util"
 )
 
+const email = "email"
+
 type GetAccountByPassword func(ctx context.Context, localpart, password string) (*api.Account, error)
 
 type PasswordRequest struct {
@@ -59,9 +61,9 @@ func (t *LoginTypePassword) Login(ctx context.Context, req interface{}) (*Login,
 	if username != "" {
 		localpart, err = userutil.ParseUsernameParam(username, &t.Config.Matrix.ServerName)
 	} else {
-		if r.Medium == "email" {
+		if r.Medium == email {
 			if r.Address != "" {
-				localpart, err = t.AccountDB.GetLocalpartForThreePID(ctx, r.Address, "email")
+				localpart, err = t.AccountDB.GetLocalpartForThreePID(ctx, r.Address, email)
 				if localpart == "" {
 					return nil, &util.JSONResponse{
 						Code: http.StatusForbidden,
diff --git a/cmd/dendrite-demo-pinecone/embed/embed_other.go b/cmd/dendrite-demo-pinecone/embed/embed_other.go
index 04c2188c31..a4b2234527 100644
--- a/cmd/dendrite-demo-pinecone/embed/embed_other.go
+++ b/cmd/dendrite-demo-pinecone/embed/embed_other.go
@@ -1,3 +1,4 @@
+//go:build !elementweb
 // +build !elementweb
 
 package embed
diff --git a/cmd/dendrite-demo-yggdrasil/embed/embed_other.go b/cmd/dendrite-demo-yggdrasil/embed/embed_other.go
index 04c2188c31..a4b2234527 100644
--- a/cmd/dendrite-demo-yggdrasil/embed/embed_other.go
+++ b/cmd/dendrite-demo-yggdrasil/embed/embed_other.go
@@ -1,3 +1,4 @@
+//go:build !elementweb
 // +build !elementweb
 
 package embed
diff --git a/cmd/dendritejs-pinecone/main_noop.go b/cmd/dendritejs-pinecone/main_noop.go
index dcea032f2b..0cc7e47e50 100644
--- a/cmd/dendritejs-pinecone/main_noop.go
+++ b/cmd/dendritejs-pinecone/main_noop.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package main
diff --git a/cmd/dendritejs/main_noop.go b/cmd/dendritejs/main_noop.go
index dcea032f2b..0cc7e47e50 100644
--- a/cmd/dendritejs/main_noop.go
+++ b/cmd/dendritejs/main_noop.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package main
diff --git a/federationsender/storage/storage.go b/federationsender/storage/storage.go
index 5462c35237..46e01f2566 100644
--- a/federationsender/storage/storage.go
+++ b/federationsender/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/internal/sqlutil/postgres.go b/internal/sqlutil/postgres.go
index 41a5508a19..5e656b1dad 100644
--- a/internal/sqlutil/postgres.go
+++ b/internal/sqlutil/postgres.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package sqlutil
diff --git a/internal/sqlutil/trace_driver.go b/internal/sqlutil/trace_driver.go
index f123b1e4d2..b7bb36764f 100644
--- a/internal/sqlutil/trace_driver.go
+++ b/internal/sqlutil/trace_driver.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package sqlutil
diff --git a/keyserver/storage/storage.go b/keyserver/storage/storage.go
index 8f05d0030a..742e8463a2 100644
--- a/keyserver/storage/storage.go
+++ b/keyserver/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/mediaapi/storage/storage.go b/mediaapi/storage/storage.go
index a976f795b9..56059f1c85 100644
--- a/mediaapi/storage/storage.go
+++ b/mediaapi/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/mediaapi/thumbnailer/thumbnailer_nfnt.go b/mediaapi/thumbnailer/thumbnailer_nfnt.go
index aa9faf4c16..1fafa2943d 100644
--- a/mediaapi/thumbnailer/thumbnailer_nfnt.go
+++ b/mediaapi/thumbnailer/thumbnailer_nfnt.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !bimg
 // +build !bimg
 
 package thumbnailer
diff --git a/roomserver/storage/storage.go b/roomserver/storage/storage.go
index 9359312dbf..9f98ea3ed5 100644
--- a/roomserver/storage/storage.go
+++ b/roomserver/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/signingkeyserver/storage/keydb.go b/signingkeyserver/storage/keydb.go
index aa247f1d8a..82b6d0ad5f 100644
--- a/signingkeyserver/storage/keydb.go
+++ b/signingkeyserver/storage/keydb.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/syncapi/storage/storage.go b/syncapi/storage/storage.go
index 15386c3387..7f9c28e9d8 100644
--- a/syncapi/storage/storage.go
+++ b/syncapi/storage/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package storage
diff --git a/userapi/storage/accounts/storage.go b/userapi/storage/accounts/storage.go
index 3489c9d073..a21f7d94e7 100644
--- a/userapi/storage/accounts/storage.go
+++ b/userapi/storage/accounts/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package accounts
diff --git a/userapi/storage/devices/storage.go b/userapi/storage/devices/storage.go
index bfce924d99..3c2034300a 100644
--- a/userapi/storage/devices/storage.go
+++ b/userapi/storage/devices/storage.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !wasm
 // +build !wasm
 
 package devices