diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec
index e247a73a9bc..6f64b9ea521 100644
--- a/dlls/odbc32/odbc32.spec
+++ b/dlls/odbc32/odbc32.spec
@@ -33,7 +33,7 @@ init    MAIN_OdbcInit
 029 stdcall SQLEndTran(long long long) SQLEndTran
 030 stdcall SQLFetchScroll(long long long) SQLFetchScroll
 031 stdcall SQLFreeHandle(long long) SQLFreeHandle
-032 stdcall SQLGetConnectAttr(long long ptr ptr) SQLGetConnectAttr
+032 stdcall SQLGetConnectAttr(long long ptr long ptr) SQLGetConnectAttr
 033 stdcall SQLGetDescField(long long long ptr long ptr) SQLGetDescField
 034 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr) SQLGetDescRec
 035 stdcall SQLGetDiagField(long long long long ptr long ptr) SQLGetDiagField
@@ -62,10 +62,10 @@ init    MAIN_OdbcInit
 058 stdcall SQLDescribeParam(long long ptr ptr ptr ptr) SQLDescribeParam
 059 stdcall SQLExtendedFetch(long long long ptr ptr) SQLExtendedFetch
 060 stdcall SQLForeignKeys(long str long str long str long str long str long str long) SQLForeignKeys
-061 stdcall SQLMoreResults(long str long str long ptr) SQLMoreResults
-062 stdcall SQLNativeSql(long str long str long str long) SQLNativeSql
+061 stdcall SQLMoreResults(long) SQLMoreResults
+062 stdcall SQLNativeSql(long str long str long ptr) SQLNativeSql
 063 stdcall SQLNumParams(long ptr) SQLNumParams
-064 stdcall SQLParamOptions(long str long str long str long) SQLParamOptions
+064 stdcall SQLParamOptions(long long ptr) SQLParamOptions
 065 stdcall SQLPrimaryKeys(long str long str long str long) SQLPrimaryKeys
 066 stdcall SQLProcedureColumns(long str long str long str long str long) SQLProcedureColumns
 067 stdcall SQLProcedures(long str long str long str long) SQLProcedures
diff --git a/misc/registry.c b/misc/registry.c
index afe70ba8987..a79d1b45dad 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -30,6 +30,7 @@
 #include <sys/errno.h>
 #endif
 #include <sys/types.h>
+#include <fcntl.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <assert.h>
@@ -731,7 +732,10 @@ static void _copy_registry( HKEY from, HKEY to )
     }
 }
 /* NT REGISTRY LOADER */
-#include <sys/mman.h>
+
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
 
 #ifndef MAP_FAILED
 #define MAP_FAILED ((LPVOID)-1)
diff --git a/relay32/kernel32.spec b/relay32/kernel32.spec
index 09047c3f2ff..a9b5317646e 100644
--- a/relay32/kernel32.spec
+++ b/relay32/kernel32.spec
@@ -192,7 +192,7 @@ import  ntdll.dll
 174 stdcall CreateSemaphoreA(ptr long long str) CreateSemaphoreA
 175 stdcall CreateSemaphoreW(ptr long long wstr) CreateSemaphoreW
 176 stdcall CreateSocketHandle() CreateSocketHandle
-177 stub CreateTapePartition
+177 stdcall CreateTapePartition(long long long long) CreateTapePartition
 178 stdcall CreateThread(ptr long ptr long long ptr) CreateThread
 179 stdcall CreateToolhelp32Snapshot(long long) CreateToolhelp32Snapshot
 180 stdcall DebugActiveProcess(long) DebugActiveProcess