diff --git a/federationapi/queue/destinationqueue.go b/federationapi/queue/destinationqueue.go
index 0d937ffaf..5cb8cae1f 100644
--- a/federationapi/queue/destinationqueue.go
+++ b/federationapi/queue/destinationqueue.go
@@ -162,7 +162,7 @@ func (oq *destinationQueue) sendEDU(event *gomatrixserverlib.EDU, receipt *share
 // requests to retry.
 func (oq *destinationQueue) wakeQueueIfNeeded() {
 	// If we are backing off then interrupt the backoff.
-	if oq.backingOff.CAS(true, false) {
+	if oq.backingOff.CompareAndSwap(true, false) {
 		oq.interruptBackoff <- true
 	}
 	// If we aren't running then wake up the queue.
@@ -242,7 +242,7 @@ func (oq *destinationQueue) getPendingFromDatabase() {
 func (oq *destinationQueue) backgroundSend() {
 	// Check if a worker is already running, and if it isn't, then
 	// mark it as started.
-	if !oq.running.CAS(false, true) {
+	if !oq.running.CompareAndSwap(false, true) {
 		return
 	}
 	destinationQueueRunning.Inc()
diff --git a/federationapi/statistics/statistics.go b/federationapi/statistics/statistics.go
index b8e16a259..db6d5c735 100644
--- a/federationapi/statistics/statistics.go
+++ b/federationapi/statistics/statistics.go
@@ -114,7 +114,7 @@ func (s *ServerStatistics) Failure() (time.Time, bool) {
 	// a new backoff period. Increase the failure counter and
 	// start a goroutine which will wait out the backoff and
 	// unset the backoffStarted flag when done.
-	if s.backoffStarted.CAS(false, true) {
+	if s.backoffStarted.CompareAndSwap(false, true) {
 		if s.backoffCount.Inc() >= s.statistics.FailuresUntilBlacklist {
 			s.blacklisted.Store(true)
 			if s.statistics.DB != nil {
diff --git a/internal/sqlutil/unique_constraint.go b/internal/sqlutil/unique_constraint.go
index 4a1b7fd94..ed70f5ed2 100644
--- a/internal/sqlutil/unique_constraint.go
+++ b/internal/sqlutil/unique_constraint.go
@@ -27,8 +27,6 @@ func IsUniqueConstraintViolationErr(err error) bool {
 	switch e := err.(type) {
 	case *pq.Error:
 		return e.Code == "23505"
-	case pq.Error:
-		return e.Code == "23505"
 	case *sqlite3.Error:
 		return e.Code == sqlite3.ErrConstraint
 	case sqlite3.Error:
diff --git a/internal/sqlutil/writer_exclusive.go b/internal/sqlutil/writer_exclusive.go
index 91dd77e4d..8eff3ce55 100644
--- a/internal/sqlutil/writer_exclusive.go
+++ b/internal/sqlutil/writer_exclusive.go
@@ -57,7 +57,7 @@ func (w *ExclusiveWriter) Do(db *sql.DB, txn *sql.Tx, f func(txn *sql.Tx) error)
 // opened using the database object from the task and then this will
 // be passed as a parameter to the task function.
 func (w *ExclusiveWriter) run() {
-	if !w.running.CAS(false, true) {
+	if !w.running.CompareAndSwap(false, true) {
 		return
 	}
 	if tracingEnabled {
diff --git a/setup/base/base.go b/setup/base/base.go
index 3070bed5f..0a34523e7 100644
--- a/setup/base/base.go
+++ b/setup/base/base.go
@@ -498,7 +498,7 @@ func (b *BaseDendrite) SetupAndServeHTTP(
 			logrus.Infof("Starting internal %s listener on %s", b.componentName, internalServ.Addr)
 			b.ProcessContext.ComponentStarted()
 			internalServ.RegisterOnShutdown(func() {
-				if internalShutdown.CAS(false, true) {
+				if internalShutdown.CompareAndSwap(false, true) {
 					b.ProcessContext.ComponentFinished()
 					logrus.Infof("Stopped internal HTTP listener")
 				}
@@ -526,7 +526,7 @@ func (b *BaseDendrite) SetupAndServeHTTP(
 			logrus.Infof("Starting external %s listener on %s", b.componentName, externalServ.Addr)
 			b.ProcessContext.ComponentStarted()
 			externalServ.RegisterOnShutdown(func() {
-				if externalShutdown.CAS(false, true) {
+				if externalShutdown.CompareAndSwap(false, true) {
 					b.ProcessContext.ComponentFinished()
 					logrus.Infof("Stopped external HTTP listener")
 				}
diff --git a/setup/process/process.go b/setup/process/process.go
index 01eb26e22..06ef60217 100644
--- a/setup/process/process.go
+++ b/setup/process/process.go
@@ -51,7 +51,7 @@ func (b *ProcessContext) WaitForComponentsToFinish() {
 }
 
 func (b *ProcessContext) Degraded() {
-	if b.degraded.CAS(false, true) {
+	if b.degraded.CompareAndSwap(false, true) {
 		logrus.Warn("Dendrite is running in a degraded state")
 		sentry.CaptureException(fmt.Errorf("Process is running in a degraded state"))
 	}