diff --git a/eNpc b/eNpc
old mode 100755
new mode 100644
index efdff9c..cd4361a
Binary files a/eNpc and b/eNpc differ
diff --git a/src/npRCompiler.erl b/src/npRCompiler.erl
index 56d2b29..0b8b9af 100644
--- a/src/npRCompiler.erl
+++ b/src/npRCompiler.erl
@@ -727,7 +727,37 @@ defaultEnv() ->
       {"win32", "DRV_LDFLAGS", "/DLL $ERL_LDFLAGS"},
       %% Provide some default Windows defines for convenience
       {"win32", "CFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS /Ic_src $CFLAGS"},
-      {"win32", "CXXFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS /Ic_src $CXXFLAGS"}
+      {"win32", "CXXFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS /Ic_src $CXXFLAGS"},
+
+      {"windows", "CC", "cl.exe"},
+      {"windows", "CXX", "cl.exe"},
+      {"windows", "LINKER", "link.exe"},
+      {"windows", "DRV_CXX_TEMPLATE",
+         %% DRV_* and EXE_* Templates are identical
+         "$CXX /c $CXXFLAGS $DRV_CFLAGS $PORT_IN_FILES /Fo$PORT_OUT_FILE"},
+      {"windows", "DRV_CC_TEMPLATE",
+         "$CC /c $CFLAGS $DRV_CFLAGS $PORT_IN_FILES /Fo$PORT_OUT_FILE"},
+      {"windows", "DRV_LINK_TEMPLATE",
+         "$LINKER $PORT_IN_FILES $LDFLAGS $DRV_LDFLAGS /OUT:$PORT_OUT_FILE"},
+      {"windows", "DRV_LINK_CXX_TEMPLATE",
+         "$LINKER $PORT_IN_FILES $LDFLAGS $DRV_LDFLAGS /OUT:$PORT_OUT_FILE"},
+      %% DRV_* and EXE_* Templates are identical
+      {"windows", "EXE_CXX_TEMPLATE",
+         "$CXX /c $CXXFLAGS $EXE_CFLAGS $PORT_IN_FILES /Fo$PORT_OUT_FILE"},
+      {"windows", "EXE_CC_TEMPLATE",
+         "$CC /c $CFLAGS $EXE_CFLAGS $PORT_IN_FILES /Fo$PORT_OUT_FILE"},
+      {"windows", "EXE_LINK_TEMPLATE",
+         "$LINKER $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS /OUT:$PORT_OUT_FILE"},
+      {"windows", "EXE_LINK_CXX_TEMPLATE",
+         "$LINKER $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS /OUT:$PORT_OUT_FILE"},
+      %% ERL_CFLAGS are ok as -I even though strictly it should be /I
+      {"windows", "ERL_LDFLAGS",
+         " /LIBPATH:$ERL_EI_LIBDIR ei.lib"},
+      {"windows", "DRV_CFLAGS", "/Zi /Wall $ERL_CFLAGS"},
+      {"windows", "DRV_LDFLAGS", "/DLL $ERL_LDFLAGS"},
+      %% Provide some default Windows defines for convenience
+      {"windows", "CFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS /Ic_src $CFLAGS"},
+      {"windows", "CXXFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS /Ic_src $CXXFLAGS"}
    ].
 
 getTool(Arch, Tool, Default) ->
diff --git a/src/npRMain.erl b/src/npRMain.erl
index d319ef4..fd4faeb 100644
--- a/src/npRMain.erl
+++ b/src/npRMain.erl
@@ -1,5 +1,6 @@
 -module(npRMain).
 
+-compile([export_all]).
 -export([
    main/1,
    log/3
@@ -150,7 +151,7 @@ initConfig_1(BaseConfig) ->
 
 runAux(BaseConfig, Commands) ->
    %% Make sure crypto is running
-   case crypto:start() of
+   case application:start(crypto) of
       ok -> ok;
       {error, {already_started, crypto}} -> ok
    end,