diff --git a/base/services/nfsd/nfs41_daemon.c b/base/services/nfsd/nfs41_daemon.c
index 1a8f2dfbbe2..c2f5df2b1b7 100644
--- a/base/services/nfsd/nfs41_daemon.c
+++ b/base/services/nfsd/nfs41_daemon.c
@@ -38,7 +38,8 @@
 #include "upcall.h"
 #include "util.h"
 
-#define MAX_NUM_THREADS 128
+//#define MAX_NUM_THREADS 128
+#define MAX_NUM_THREADS 1
 DWORD NFS41D_VERSION = 0;
 
 #ifndef __REACTOS__
@@ -123,6 +124,7 @@ static unsigned int WINAPI thread_main(void *args)
         }
 
         if (upcall.opcode == NFS41_SHUTDOWN) {
+            DbgPrint("Shutdown\n");
             printf("Shutting down..\n");
             exit(0);
         }
@@ -155,6 +157,7 @@ write_downcall:
 #ifndef STANDALONE_NFSD
 VOID ServiceStop()
 {
+   DbgPrint("Setting stop event\n");
    if (stop_event)
       SetEvent(stop_event);
 }
@@ -333,8 +336,17 @@ static int getdomainname()
                             (socklen_t)ptr->ai_addrlen, hostname, NI_MAXHOST, 
                             servInfo, NI_MAXSERV, NI_NAMEREQD);
                 if (status)
+#if 0
                     dprintf(1, "getnameinfo failed %d\n", WSAGetLastError());
                 else {
+#else
+                {
+                    dprintf(1, "getnameinfo failed %d, forcing name\n", WSAGetLastError());
+                    memcpy(hostname, "reactos.home", sizeof("reactos.home"));
+                    status = 0;
+                }
+                {
+#endif
                     size_t i, len = strlen(hostname);
                     char *p = hostname;
                     dprintf(1, "getdomainname: hostname %s %d\n", hostname, len);
@@ -486,6 +498,8 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv)
     }
 
 #ifndef STANDALONE_NFSD
+    DbgPrint("WaitEvent\n");
+
     stop_event = CreateEvent(NULL, TRUE, FALSE, NULL);
     if (stop_event == NULL)
       goto out_pipe;
@@ -504,6 +518,7 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv)
     // report the status to the service control manager.
     if (!ReportStatusToSCMgr(SERVICE_RUNNING, NO_ERROR, 0))
         goto out_pipe;
+    DbgPrint("Starting wait\n");
     WaitForSingleObject(stop_event, INFINITE);
 #else
     //This can be changed to waiting on an array of handles and using waitformultipleobjects
diff --git a/base/services/nfsd/service.c b/base/services/nfsd/service.c
index c31fd143d64..05e83117a8d 100644
--- a/base/services/nfsd/service.c
+++ b/base/services/nfsd/service.c
@@ -139,6 +139,8 @@ void WINAPI service_main(DWORD dwArgc, LPTSTR *lpszArgv)
    if (!sshStatusHandle)
       goto cleanup;
 
+    DbgPrint("Starting service\n");
+
    // SERVICE_STATUS members that don't change in example
    //
    ssStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
@@ -153,9 +155,14 @@ void WINAPI service_main(DWORD dwArgc, LPTSTR *lpszArgv)
                            3000))                 // wait hint
       goto cleanup;
 
+    DbgPrint("Starting service 2\n");
+
+   SetConsoleCtrlHandler( ControlHandler, TRUE );
 
    ServiceStart( dwArgc, lpszArgv );
 
+    DbgPrint("Done\n");
+
    cleanup:
 
    // try to report the stopped status to the service control manager.
@@ -189,6 +196,9 @@ VOID WINAPI service_ctrl(DWORD dwCtrlCode)
 {
    // Handle the requested control code.
    //
+
+    DbgPrint("service_ctrl called\n");
+
    switch (dwCtrlCode)
    {
    // Stop the service.
@@ -198,9 +208,14 @@ VOID WINAPI service_ctrl(DWORD dwCtrlCode)
    // ServiceStop().  This avoids a race condition
    // which may result in a 1053 - The Service did not respond...
    // error.
+#ifdef __REACTOS__
+   case SERVICE_CONTROL_SHUTDOWN:
+#endif
    case SERVICE_CONTROL_STOP:
+      DbgPrint("for stop\n");
       ReportStatusToSCMgr(SERVICE_STOP_PENDING, NO_ERROR, 0);
       ServiceStop();
+        DbgPrint("Done\n");
       return;
 
       // Update the service status.
@@ -250,7 +265,11 @@ BOOL ReportStatusToSCMgr(DWORD dwCurrentState,
       if (dwCurrentState == SERVICE_START_PENDING)
          ssStatus.dwControlsAccepted = 0;
       else
+#ifndef __REACTOS__
          ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP;
+#else
+         ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+#endif
 
       ssStatus.dwCurrentState = dwCurrentState;
       ssStatus.dwWin32ExitCode = dwWin32ExitCode;
diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc
index a2caedc6f02..9dc9c22e7d5 100644
--- a/dll/shellext/cryptext/cryptext.rc
+++ b/dll/shellext/cryptext/cryptext.rc
@@ -17,6 +17,9 @@
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
 #ifdef LANGUAGE_HE_IL
     #include "lang/he-IL.rc"
 #endif
diff --git a/dll/shellext/cryptext/lang/fr-FR.rc b/dll/shellext/cryptext/lang/fr-FR.rc
new file mode 100644
index 00000000000..9700706a833
--- /dev/null
+++ b/dll/shellext/cryptext/lang/fr-FR.rc
@@ -0,0 +1,14 @@
+/*
+ * PROJECT:     ReactOS CryptExt Shell Extension
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     French (Neutral) resource translation
+ * COPYRIGHT:   Copyright 2019 Pierre Schweitzer (pierre@reactos.org)
+ */
+
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_INVALIDFILE "Ce n'est pas un fichier de certificat valide."
+    IDS_CER_FILE "Fichier de certificat"
+END
diff --git a/dll/win32/ole32/rpc.c b/dll/win32/ole32/rpc.c
index bd4611d7d5f..d53287e4cb6 100644
--- a/dll/win32/ole32/rpc.c
+++ b/dll/win32/ole32/rpc.c
@@ -1633,6 +1633,8 @@ HRESULT RPC_ResolveOxid(OXID oxid, OXID_INFO *oxid_info)
  * IRemUnknown object */
 void RPC_StartRemoting(struct apartment *apt)
 {
+    ERR("Starting remoting: %d %p %p\n", apt->remoting_started, GetCurrentProcessId(), GetCurrentThreadId());
+
     if (!InterlockedExchange(&apt->remoting_started, TRUE))
     {
         WCHAR endpoint[200];
diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c
index c85f1bfb9f6..ad3213588e0 100644
--- a/drivers/filesystems/ntfs/fsctl.c
+++ b/drivers/filesystems/ntfs/fsctl.c
@@ -904,7 +904,7 @@ NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject,
     PIO_STACK_LOCATION Stack;
     PDEVICE_EXTENSION DeviceExt;
 
-    DPRINT1("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp);
+    DPRINT("NtfsUserFsRequest(%p, %p)\n", DeviceObject, Irp);
 
     Stack = IoGetCurrentIrpStackLocation(Irp);
     DeviceExt = DeviceObject->DeviceExtension;
@@ -966,7 +966,7 @@ NtfsFileSystemControl(PNTFS_IRP_CONTEXT IrpContext)
     PIRP Irp;
     PDEVICE_OBJECT DeviceObject;
 
-    DPRINT1("NtfsFileSystemControl() called\n");
+    DPRINT("NtfsFileSystemControl() called\n");
 
     DeviceObject = IrpContext->DeviceObject;
     Irp = IrpContext->Irp;
diff --git a/modules/rosapps/applications/devutils/CMakeLists.txt b/modules/rosapps/applications/devutils/CMakeLists.txt
index 5ea4b089d6a..0f289ef3b60 100644
--- a/modules/rosapps/applications/devutils/CMakeLists.txt
+++ b/modules/rosapps/applications/devutils/CMakeLists.txt
@@ -3,6 +3,7 @@ add_subdirectory(createspec)
 add_subdirectory(gdb2)
 add_subdirectory(gdihv)
 add_subdirectory(genguid)
+add_subdirectory(ioctlbf)
 add_subdirectory(nls2txt)
 add_subdirectory(shimdbg)
 add_subdirectory(shlextdbg)