diff --git a/reactos/boot/environ/CMakeLists.txt b/reactos/boot/environ/CMakeLists.txt
index f1ca4946736..d7d9332d12c 100644
--- a/reactos/boot/environ/CMakeLists.txt
+++ b/reactos/boot/environ/CMakeLists.txt
@@ -126,7 +126,11 @@ else()
     set_subsystem(rosload 16)
 endif()
 
-set_entrypoint(rosload OslMain@4)
+if(ARCH STREQUAL "i386")
+    set_entrypoint(rosload OslMain 4)
+else()
+    set_entrypoint(rosload OslMain)
+endif()
 
 target_link_libraries(rosload bootlib cportlib cmlib rtl libcntpr)
 
diff --git a/reactos/boot/environ/app/bootmgr/bootmgr.c b/reactos/boot/environ/app/bootmgr/bootmgr.c
index 47c562beb1a..cfc9952a0ab 100644
--- a/reactos/boot/environ/app/bootmgr/bootmgr.c
+++ b/reactos/boot/environ/app/bootmgr/bootmgr.c
@@ -2724,6 +2724,7 @@ Quickie:
  *
  *--*/
 NTSTATUS
+NTAPI
 BmMain (
     _In_ PBOOT_APPLICATION_PARAMETER_BLOCK BootParameters
     )
diff --git a/reactos/boot/environ/app/bootmgr/bootmgr.h b/reactos/boot/environ/app/bootmgr/bootmgr.h
index a8fd29ac943..80be2b63f80 100644
--- a/reactos/boot/environ/app/bootmgr/bootmgr.h
+++ b/reactos/boot/environ/app/bootmgr/bootmgr.h
@@ -62,6 +62,7 @@ typedef struct _BL_PACKED_BOOT_ERROR
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS
+NTAPI
 BmMain (
     _In_ PBOOT_APPLICATION_PARAMETER_BLOCK BootParameters
     );
diff --git a/reactos/boot/environ/app/rosload/rosload.c b/reactos/boot/environ/app/rosload/rosload.c
index e581b8faac5..000cbee7abd 100644
--- a/reactos/boot/environ/app/rosload/rosload.c
+++ b/reactos/boot/environ/app/rosload/rosload.c
@@ -17,7 +17,7 @@
 /*++
  * @name OslMain
  *
- *     The BmMain function implements the Windows Boot Application entrypoint for
+ *     The OslMain function implements the Windows Boot Application entrypoint for
  *     the OS Loader.
  *
  * @param  BootParameters