diff --git a/core/mem/mem.odin b/core/mem/mem.odin
index bafac60d5..a56702ae8 100644
--- a/core/mem/mem.odin
+++ b/core/mem/mem.odin
@@ -53,9 +53,8 @@ compare :: inline proc "contextless" (a, b: []byte) -> int {
 		return len(a) <= len(b) ? -1 : +1;
 	} else if len(a) == 0 && len(b) == 0 {
 		return 0;
-	} else {
-		return res;
 	}
+	return res;
 }
 
 compare_byte_ptrs :: proc "contextless" (a, b: ^byte, n: int) -> int #no_bounds_check {
diff --git a/core/odin/parser/parser.odin b/core/odin/parser/parser.odin
index 93ecddbda..5b43374ff 100644
--- a/core/odin/parser/parser.odin
+++ b/core/odin/parser/parser.odin
@@ -214,17 +214,17 @@ consume_comment_group :: proc(p: ^Parser, n: int) -> (comments: ^ast.Comment_Gro
 	for p.curr_tok.kind == .Comment &&
 	    p.curr_tok.pos.line <= end_line+n {
 	    comment: tokenizer.Token;
-    	comment, end_line = consume_comment(p);
+		comment, end_line = consume_comment(p);
 		append(&list, comment);
-    }
+	}
 
-    if len(list) > 0 {
-    	comments = new(ast.Comment_Group);
-    	comments.list = list[:];
-    	append(&p.file.comments, comments);
-    }
+	if len(list) > 0 {
+		comments = new(ast.Comment_Group);
+		comments.list = list[:];
+		append(&p.file.comments, comments);
+	}
 
-    return;
+	return;
 }
 
 consume_comment_groups :: proc(p: ^Parser, prev: tokenizer.Token) {
diff --git a/core/sys/win32/general.odin b/core/sys/win32/general.odin
index 642966b58..b0424b78d 100644
--- a/core/sys/win32/general.odin
+++ b/core/sys/win32/general.odin
@@ -22,7 +22,7 @@ HKL       :: distinct Handle;
 Wparam    :: distinct Uint_Ptr;
 Lparam    :: distinct Long_Ptr;
 Lresult   :: distinct Long_Ptr;
-Wnd_Proc  :: distinct #type proc "c" (Hwnd, u32, Wparam, Lparam) -> Lresult;
+Wnd_Proc  :: distinct #type proc "std" (Hwnd, u32, Wparam, Lparam) -> Lresult;
 Monitor_Enum_Proc :: distinct #type proc "std" (Hmonitor, Hdc, ^Rect, Lparam) -> bool;
 
 
diff --git a/core/sys/win32/user32.odin b/core/sys/win32/user32.odin
index 58200cc93..6ff7b6a38 100644
--- a/core/sys/win32/user32.odin
+++ b/core/sys/win32/user32.odin
@@ -136,8 +136,10 @@ foreign user32 {
 	@(link_name="PeekMessageW") peek_message_w :: proc(msg: ^Msg, hwnd: Hwnd, msg_filter_min, msg_filter_max, remove_msg: u32) -> Bool ---;
 
 
-	@(link_name="PostMessageA") post_message_a :: proc(hwnd: Hwnd, msg, wparam, lparam: u32) -> Bool ---;
-	@(link_name="PostMessageW") post_message_w :: proc(hwnd: Hwnd, msg, wparam, lparam: u32) -> Bool ---;
+	@(link_name="PostMessageA") post_message_a :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Bool ---;
+	@(link_name="PostMessageW") post_message_w :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Bool ---;
+	@(link_name="SendMessageA") send_message_a :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Bool ---;
+	@(link_name="SendMessageW") send_message_w :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Bool ---;
 
 	@(link_name="DefWindowProcA") def_window_proc_a :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Lresult ---;
 	@(link_name="DefWindowProcW") def_window_proc_w :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Lresult ---;