3 files changed, 4 insertions, 8 deletions
diff --git a/platform/windows/key_mapping_win.cpp b/platform/windows/key_mapping_win.cpp
index bffacb3a82..83e2af72b2 100644
--- a/platform/windows/key_mapping_win.cpp
+++ b/platform/windows/key_mapping_win.cpp
@@ -44,7 +44,7 @@ static _WinTranslatePair _vk_to_keycode[] = {
 
 	//VK_CLEAR (0x0C)
 
-	{ KEY_RETURN, VK_RETURN }, //(0x0D)
+	{ KEY_ENTER, VK_RETURN }, //(0x0D)
 
 	{ KEY_SHIFT, VK_SHIFT }, //(0x10)
 
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index da14d5c284..f72e5ef595 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -807,7 +807,7 @@ void OS_Windows::process_key_events() {
 
 				if ((ke.lParam & (1 << 24)) && (ke.wParam == VK_RETURN)) {
 					// Special case for Numpad Enter key
-					k->set_scancode(KEY_ENTER);
+					k->set_scancode(KEY_KP_ENTER);
 				} else {
 					k->set_scancode(KeyMappingWindows::get_keysym(ke.wParam));
 				}
@@ -1192,10 +1192,6 @@ void OS_Windows::finalize() {
 
 	main_loop = NULL;
 
-	for (int i = 0; i < get_audio_driver_count(); i++) {
-		AudioDriverManager::get_driver(i)->finish();
-	}
-
 	memdelete(joypad);
 	memdelete(input);
 
@@ -1952,7 +1948,7 @@ Error OS_Windows::kill(const ProcessID &p_pid) {
 	return ret != 0 ? OK : FAILED;
 };
 
-int OS_Windows::get_process_ID() const {
+int OS_Windows::get_process_id() const {
 	return _getpid();
 }
 
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 6856e7e9b8..beaf5d5e35 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -247,7 +247,7 @@ public:
 
 	virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL);
 	virtual Error kill(const ProcessID &p_pid);
-	virtual int get_process_ID() const;
+	virtual int get_process_id() const;
 
 	virtual bool has_environment(const String &p_var) const;
 	virtual String get_environment(const String &p_var) const;