diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
index 69d7a9af61..1cf8621c20 100644
--- a/Qt/mainwindow.h
+++ b/Qt/mainwindow.h
@@ -153,7 +153,7 @@ class MenuAction : public QAction
 
 public:
 	// Add to QMenu
-	MenuAction(QWidget* parent, const char* callback, char* text, QKeySequence key = 0) :
+	MenuAction(QWidget* parent, const char *callback, const char *text, QKeySequence key = 0) :
 		QAction(parent), _text(text), _eventCheck(0), _stateEnable(-1), _stateDisable(-1), _enableStepping(false)
 	{
 		if (key != (QKeySequence)0) {
@@ -213,8 +213,8 @@ public slots:
 			setEnabled(true);
 	}
 private:
-	char* _text;
-	bool* _eventCheck;
+	const char *_text;
+	bool *_eventCheck;
 	int _stateEnable, _stateDisable;
 	bool _enableStepping;
 };
@@ -241,13 +241,13 @@ class MenuTree : public QMenu
 {
 	Q_OBJECT
 public:
-	MenuTree(QWidget* parent, QMenuBar* menu, char* text) :
+	MenuTree(QWidget* parent, QMenuBar* menu, const char *text) :
 		QMenu(parent), _text(text)
 	{
 		menu->addMenu(this);
 		connect(parent, SIGNAL(retranslate()), this, SLOT(retranslate()));
 	}
-	MenuTree(QWidget* parent, QMenu* menu, char* text) :
+	MenuTree(QWidget* parent, QMenu* menu, const char *text) :
 		QMenu(parent), _text(text)
 	{
 		menu->addMenu(this);
@@ -263,7 +263,7 @@ public slots:
 		setTitle(qApp->translate("MainWindow", _text));
 	}
 private:
-	char* _text;
+	const char *_text;
 };
 
 #endif // MAINWINDOW_H
diff --git a/Windows/main.cpp b/Windows/main.cpp
index 11a5250c2e..4b1fe9592b 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -182,7 +182,7 @@ void EnableCrashingOnCrashes()
   } 
 }
 
-bool System_InputBoxGetString(char *title, const char *defaultValue, char *outValue, size_t outLength)
+bool System_InputBoxGetString(const char *title, const char *defaultValue, char *outValue, size_t outLength)
 {
 	std::string out;
 	if (InputBox_GetString(MainWindow::GetHInstance(), MainWindow::GetHWND(), ConvertUTF8ToWString(title).c_str(), defaultValue, out)) {
diff --git a/native b/native
index 263e2207be..36a9bafcaf 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 263e2207be4a281c7991419bff2c69224d8a4288
+Subproject commit 36a9bafcaf90b962480c1ce12155f313ba101cc9