diff --git a/atomicio.c b/atomicio.c
index b1ec234..0f3f9b8 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -54,7 +54,7 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n,
 {
 	char *s = _s;
 	size_t pos = 0;
-	ssize_t res;
+	int res;
 	struct pollfd pfd;
 
 #ifndef BROKEN_READ_COMPARISON
diff --git a/contrib/win32/win32compat/tncon.c b/contrib/win32/win32compat/tncon.c
index 23b232f..43f7fc5 100644
--- a/contrib/win32/win32compat/tncon.c
+++ b/contrib/win32/win32compat/tncon.c
@@ -650,9 +650,11 @@ int ReadConsoleForTermEmul(HANDLE hInput, char *destin, int destinlen)
                                     NetWriteString2(pParams->Socket, (char *)BACKSPACE_KEY, 1, 0);
                                     break;
                                 case VK_TAB:
-                                    if (dwControlKeyState == SHIFT_PRESSED)
-                                        NetWriteString2(pParams->Socket, (char *)SHIFT_TAB_KEY, 3, 0);
-                                    break;
+                                        if (dwControlKeyState == SHIFT_PRESSED)
+                                                NetWriteString2(pParams->Socket, (char *)SHIFT_TAB_KEY, 3, 0);
+                                        else
+                                                NetWriteString2(pParams->Socket, (char *)octets, n, 0);
+                                        break;
                                 case VK_ESCAPE:
                                     NetWriteString2(pParams->Socket, (char *)ESCAPE_KEY, 1, 0);
                                     break;