diff --git a/kittens/diff/collect.go b/kittens/diff/collect.go
index 5b9f7770e..9f40d532f 100644
--- a/kittens/diff/collect.go
+++ b/kittens/diff/collect.go
@@ -297,7 +297,9 @@ func (self *Collection) collect_files(left, right string) error {
 	if err != nil {
 		return err
 	}
-	err = walk(right, conf.Ignore_name, right_names, right_path_map, path_name_map)
+	if err = walk(right, conf.Ignore_name, right_names, right_path_map, path_name_map); err != nil {
+		return err
+	}
 	common_names := left_names.Intersect(right_names)
 	changed_names := utils.NewSet[string](common_names.Len())
 	for n := range common_names.Iterable() {
diff --git a/kittens/diff/ui.go b/kittens/diff/ui.go
index e3c40052f..01f473af2 100644
--- a/kittens/diff/ui.go
+++ b/kittens/diff/ui.go
@@ -627,11 +627,9 @@ func (self *Handler) dispatch_action(name, args string) error {
 			}
 			done = self.scroll_lines(amt) != 0
 		default:
-			npos := self.scroll_pos
+			npos := ScrollPos{}
 			if strings.Contains(args, `end`) {
 				npos = self.max_scroll_pos
-			} else {
-				npos = ScrollPos{}
 			}
 			done = npos != self.scroll_pos
 			self.scroll_pos = npos
diff --git a/kittens/hyperlinked_grep/main.go b/kittens/hyperlinked_grep/main.go
index 21613b97b..b4adb5f97 100644
--- a/kittens/hyperlinked_grep/main.go
+++ b/kittens/hyperlinked_grep/main.go
@@ -286,6 +286,9 @@ func (self *stdout_filter) Write(p []byte) (n int, err error) {
 
 func main(_ *cli.Command, _ *Options, args []string) (rc int, err error) {
 	delegate_to_rg, sanitized_args, kitten_opts, err := parse_args(args...)
+	if err != nil {
+		return 1, err
+	}
 	if delegate_to_rg {
 		sanitized_args = append([]string{"rg"}, sanitized_args...)
 		err = unix.Exec(RgExe(), sanitized_args, os.Environ())
diff --git a/kittens/ssh/main.go b/kittens/ssh/main.go
index cdbb273a4..bd2525e1f 100644
--- a/kittens/ssh/main.go
+++ b/kittens/ssh/main.go
@@ -65,7 +65,6 @@ func get_destination(hostname string) (username, hostname_for_match string) {
 	}
 	if !parsed && strings.Contains(hostname, "@") && hostname[0] != '@' {
 		_, hostname_for_match, _ = strings.Cut(hostname, "@")
-		parsed = true
 	}
 	return
 }
diff --git a/kittens/transfer/ftc.go b/kittens/transfer/ftc.go
index 92b727d09..b9de73b73 100644
--- a/kittens/transfer/ftc.go
+++ b/kittens/transfer/ftc.go
@@ -239,7 +239,7 @@ func NewFileTransmissionCommand(serialized string) (ans *FileTransmissionCommand
 		return
 	}
 	field_map := ftc_field_map()
-	key_length, key_start, val_start, val_length := 0, 0, 0, 0
+	key_length, key_start, val_start := 0, 0, 0
 
 	handle_value := func(key, serialized_val string) error {
 		key = strings.TrimLeft(key, `;;`)
@@ -305,7 +305,7 @@ func NewFileTransmissionCommand(serialized string) (ans *FileTransmissionCommand
 			}
 		} else {
 			if ch == ';' {
-				val_length = i - val_start
+				val_length := i - val_start
 				if key_length > 0 && val_start > 0 {
 					err = handle_value(serialized[key_start:key_start+key_length], serialized[val_start:val_start+val_length])
 					if err != nil {
@@ -315,7 +315,6 @@ func NewFileTransmissionCommand(serialized string) (ans *FileTransmissionCommand
 				key_length = 0
 				key_start = i + 1
 				val_start = 0
-				val_length = 0
 			}
 		}
 	}
diff --git a/tools/config/api_test.go b/tools/config/api_test.go
index 72ce23bbc..d5c5c355e 100644
--- a/tools/config/api_test.go
+++ b/tools/config/api_test.go
@@ -51,7 +51,9 @@ globin
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = p.ParseOverrides("over one", "over two")
+	if err = p.ParseOverrides("over one", "over two"); err != nil {
+		t.Fatal(err)
+	}
 	diff := cmp.Diff([]string{"a one", "incb cool", "b ", "inc1 cool", "inc2 cool", "env cool", "inc notcool", "over one", "over two"}, parsed_lines)
 	if diff != "" {
 		t.Fatalf("Unexpected parsed config values:\n%s", diff)
diff --git a/tools/rsync/algorithm.go b/tools/rsync/algorithm.go
index fd2dd882f..48d52500e 100644
--- a/tools/rsync/algorithm.go
+++ b/tools/rsync/algorithm.go
@@ -293,12 +293,8 @@ func (r *rsync) ApplyDelta(output io.Writer, target io.ReadSeeker, op Operation)
 		if _, err = target.Seek(int64(r.BlockSize*int(op.BlockIndex)), io.SeekStart); err != nil {
 			return err
 		}
-		n, err = io.ReadAtLeast(target, buffer, r.BlockSize)
-		if err != nil {
-			if err != io.ErrUnexpectedEOF {
-				return err
-			}
-			err = nil
+		if n, err = io.ReadAtLeast(target, buffer, r.BlockSize); err != nil && err != io.ErrUnexpectedEOF {
+			return err
 		}
 		block = buffer[:n]
 		return write(block)