diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 1c0849c07d..b7b99515b4 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,7 +2,7 @@
 
 If some of the following don't apply, delete the relevant line.
 
-- [ ] Changes file added (for user-visible changes)
+- [ ] Changes file added for user-visible changes (in `changes/` and/or `orbit/changes/`).
 - [ ] Documented any API changes (docs/Using-Fleet/REST-API.md)
 - [ ] Documented any permissions changes
 - [ ] Ensured that input data is properly validated, SQL injection is prevented (using placeholders for values in statements)
diff --git a/orbit/README.md b/orbit/README.md
index 4dddcc619f..d36e621312 100644
--- a/orbit/README.md
+++ b/orbit/README.md
@@ -219,7 +219,7 @@ Orbit captures and streams osqueryd's stdout/stderr into its own stdout/stderr o
 Following are the destination of logs for each platform (to access such locations the user will need administrative permissions on the host):
 - Linux: Orbit and osqueryd stdout/stderr output is sent to syslog (`/var/log/syslog` on Debian systems and `/var/log/messages` on CentOS).
 - macOS: `/private/var/log/orbit/orbit.std{out|err}.log`.
-- Windows: `C:\Windows\system32\config\systemprofile\AppData\Local\FleetDM\Orbit\Logs\orbit-osquery.lg` (the log file is rotated).
+- Windows: `C:\Windows\system32\config\systemprofile\AppData\Local\FleetDM\Orbit\Logs\orbit-osquery.log` (the log file is rotated).
 
 #### Debug
 
diff --git a/orbit/cmd/orbit/orbit.go b/orbit/cmd/orbit/orbit.go
index 0a8be27040..26f28a36c0 100644
--- a/orbit/cmd/orbit/orbit.go
+++ b/orbit/cmd/orbit/orbit.go
@@ -531,7 +531,7 @@ func (d *desktopRunner) actor() (func() error, func(error)) {
 // execute makes sure the fleet-desktop application is running.
 //
 // We have to support the scenario where the user closes its sessions (log out).
-// To support this, we add retries to execuser.Run. Basically retry execuser.Run until it succeds,
+// To support this, we add retries to execuser.Run. Basically retry execuser.Run until it succeeds,
 // which will happen when the user logs in.
 // Once fleet-desktop is started, the process is monitored (user processes get killed when the user
 // closes all its sessions).
diff --git a/server/datastore/mysql/policies.go b/server/datastore/mysql/policies.go
index e3d0b673e7..aeae17e863 100644
--- a/server/datastore/mysql/policies.go
+++ b/server/datastore/mysql/policies.go
@@ -78,8 +78,7 @@ func policyDB(ctx context.Context, q sqlx.QueryerContext, id uint, teamID *uint)
 
 // SavePolicy updates some fields of the given policy on the datastore.
 //
-// Currently SavePolicy does not allow updating the team or platform of an existing policy,
-// such functionality will be implemented in #3220.
+// Currently SavePolicy does not allow updating the team of an existing policy.
 func (ds *Datastore) SavePolicy(ctx context.Context, p *fleet.Policy) error {
 	sql := `
 		UPDATE policies
diff --git a/tools/tuf/init_tuf.sh b/tools/tuf/init_tuf.sh
index 69ab3b237b..41f52419be 100755
--- a/tools/tuf/init_tuf.sh
+++ b/tools/tuf/init_tuf.sh
@@ -76,7 +76,7 @@ function create_repository() {
       rm desktop.app.tar.gz
     fi
 
-    # Add Fleet Desktop application on  (if enabled).
+    # Add Fleet Desktop application on windows (if enabled).
     if [[ $system == "windows" && -n "$FLEET_DESKTOP" ]]; then
       FLEET_DESKTOP_VERSION=42.0.0 \
       make desktop-windows