diff --git a/vlib/io/buffered_reader.v b/vlib/io/buffered_reader.v
index dc4c9b4d72..860ba5356c 100644
--- a/vlib/io/buffered_reader.v
+++ b/vlib/io/buffered_reader.v
@@ -113,4 +113,5 @@ pub fn (mut r BufferedReader) read_line() ?string {
 		line << r.buf[r.offset..i]
 		r.offset = i
 	}
+	return none
 }
diff --git a/vlib/io/readerwriter.v b/vlib/io/readerwriter.v
index c7c4ae62f1..8c0dfa5fb1 100644
--- a/vlib/io/readerwriter.v
+++ b/vlib/io/readerwriter.v
@@ -36,9 +36,11 @@ struct Zzz_CoerceInterfaceTableGeneration {
 }
 
 fn (_ Zzz_CoerceInterfaceTableGeneration) write(buf []byte) ?int {
+	return none
 }
 
 fn (_ Zzz_CoerceInterfaceTableGeneration) read(mut buf []byte) ?int {
+	return none
 }
 
 fn zzz_reader_writer_coerce_compiler() {
diff --git a/vlib/net/tcp.v b/vlib/net/tcp.v
index 5432cd902a..9bb111def2 100644
--- a/vlib/net/tcp.v
+++ b/vlib/net/tcp.v
@@ -89,6 +89,7 @@ pub fn (c TcpConn) read_ptr(buf_ptr byteptr, len int) ?int {
 	} else {
 		wrap_error(code) ?
 	}
+	return none
 }
 
 pub fn (c TcpConn) read(mut buf []byte) ?int {
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
index 96d77de2e4..6b9a839cfa 100644
--- a/vlib/v/checker/checker.v
+++ b/vlib/v/checker/checker.v
@@ -5165,13 +5165,6 @@ fn (mut c Checker) fn_decl(mut node ast.FnDecl) {
 			node.stmts << ast.Return{
 				pos: node.pos
 			}
-		} else {
-			node.stmts << ast.Return{
-				pos: node.pos
-				exprs: [ast.Expr(ast.None{
-					pos: node.pos
-				})]
-			}
 		}
 	}
 	c.stmts(node.stmts)
diff --git a/vlib/v/checker/tests/unknown_generic_type.out b/vlib/v/checker/tests/unknown_generic_type.out
index 545dd374f3..ea09b5e74a 100644
--- a/vlib/v/checker/tests/unknown_generic_type.out
+++ b/vlib/v/checker/tests/unknown_generic_type.out
@@ -1,7 +1,7 @@
-vlib/v/checker/tests/unknown_generic_type.vv:5:13: error: unknown type `Foo`
-    3 |
-    4 | fn main() {
-    5 |     x := decode<Foo>('{"name": "test"}')?
+vlib/v/checker/tests/unknown_generic_type.vv:6:13: error: unknown type `Foo`
+    4 |
+    5 | fn main() {
+    6 |     x := decode<Foo>('{"name": "test"}')?
       |                ~~~~~
-    6 |     println(x)
-    7 | }
+    7 |     println(x)
+    8 | }
\ No newline at end of file
diff --git a/vlib/v/checker/tests/unknown_generic_type.vv b/vlib/v/checker/tests/unknown_generic_type.vv
index e9a52b569c..1b88eb266d 100644
--- a/vlib/v/checker/tests/unknown_generic_type.vv
+++ b/vlib/v/checker/tests/unknown_generic_type.vv
@@ -1,4 +1,5 @@
 fn decode<T>(raw_data string) ?T {
+	return none
 }
 
 fn main() {
diff --git a/vlib/v/pkgconfig/pkgconfig.v b/vlib/v/pkgconfig/pkgconfig.v
index 70a249f878..cff15a8c6a 100644
--- a/vlib/v/pkgconfig/pkgconfig.v
+++ b/vlib/v/pkgconfig/pkgconfig.v
@@ -177,6 +177,7 @@ pub fn (mut pc PkgConfig) extend(pcdep &PkgConfig) ?string {
 			pc.libs_private << lib
 		}
 	}
+	return none
 }
 
 fn (mut pc PkgConfig) load_requires() {
diff --git a/vlib/v/tests/option_test.v b/vlib/v/tests/option_test.v
index 41a017001b..ce308b3b48 100644
--- a/vlib/v/tests/option_test.v
+++ b/vlib/v/tests/option_test.v
@@ -327,6 +327,7 @@ fn get_string(param bool) ?string {
 	if param {
 		return 'Hello World'
 	}
+	return none
 }
 
 fn test_option_auto_add_return_none() {
diff --git a/vlib/x/websocket/io.v b/vlib/x/websocket/io.v
index f8b2da589c..be40ef5fdb 100644
--- a/vlib/x/websocket/io.v
+++ b/vlib/x/websocket/io.v
@@ -24,6 +24,7 @@ fn (mut ws Client) socket_read(mut buffer []byte) ?int {
 			}
 		}
 	}
+	return none
 }
 
 // socket_read reads from socket into the provided byte pointer and length
@@ -47,6 +48,7 @@ fn (mut ws Client) socket_read_ptr(buf_ptr byteptr, len int) ?int {
 			}
 		}
 	}
+	return none
 }
 
 // socket_write writes the provided byte array to the socket
diff --git a/vlib/x/websocket/message.v b/vlib/x/websocket/message.v
index 8e71681dec..8831610533 100644
--- a/vlib/x/websocket/message.v
+++ b/vlib/x/websocket/message.v
@@ -177,6 +177,7 @@ pub fn (mut ws Client) read_next_message() ?Message {
 		}
 		return msg
 	}
+	return none
 }
 
 // payload_from_fragments returs the whole paylaod from fragmented message