diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp
index 2ab96231d..361777383 100644
--- a/src/eepp/ui/uicodeeditor.cpp
+++ b/src/eepp/ui/uicodeeditor.cpp
@@ -898,9 +898,6 @@ Uint32 UICodeEditor::onFocusLoss() {
 }
 
 Uint32 UICodeEditor::onTextInput( const TextInputEvent& event ) {
-	if ( getUISceneNode()->getWindow()->getIME().isEditing() )
-		return 0;
-
 	mLastActivity.restart();
 
 	if ( mLocked || NULL == mFont )
diff --git a/src/eepp/ui/uiconsole.cpp b/src/eepp/ui/uiconsole.cpp
index ef861024b..028420657 100644
--- a/src/eepp/ui/uiconsole.cpp
+++ b/src/eepp/ui/uiconsole.cpp
@@ -889,9 +889,6 @@ Uint32 UIConsole::onKeyDown( const KeyEvent& event ) {
 }
 
 Uint32 UIConsole::onTextInput( const TextInputEvent& event ) {
-	if ( getUISceneNode()->getWindow()->getIME().isEditing() )
-		return 0;
-
 	Input* input = getUISceneNode()->getWindow()->getInput();
 
 	if ( ( input->isLeftAltPressed() && !event.getText().empty() && event.getText()[0] == '\t' ) ||
diff --git a/src/eepp/ui/uitextinput.cpp b/src/eepp/ui/uitextinput.cpp
index 71ed143ff..e95338604 100644
--- a/src/eepp/ui/uitextinput.cpp
+++ b/src/eepp/ui/uitextinput.cpp
@@ -784,9 +784,6 @@ Uint32 UITextInput::onKeyDown( const KeyEvent& event ) {
 }
 
 Uint32 UITextInput::onTextInput( const TextInputEvent& event ) {
-	if ( getUISceneNode()->getWindow()->getIME().isEditing() )
-		return 0;
-
 	if ( !mAllowEditing )
 		return 0;
 	Input* input = getUISceneNode()->getWindow()->getInput();
diff --git a/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp b/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp
index 4d982d6e6..f31865469 100644
--- a/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp
+++ b/src/modules/eterm/src/eterm/terminal/terminaldisplay.cpp
@@ -1499,7 +1499,7 @@ void TerminalDisplay::onProcessExit( int exitCode ) {
 }
 
 void TerminalDisplay::onTextInput( const Uint32& chr ) {
-	if ( !mTerminal || mWindow->getIME().isEditing() )
+	if ( !mTerminal )
 		return;
 	String input;
 	input.push_back( chr );
@@ -1507,7 +1507,7 @@ void TerminalDisplay::onTextInput( const Uint32& chr ) {
 	mTerminal->ttywrite( utf8Input.c_str(), utf8Input.size(), 1 );
 }
 
-void TerminalDisplay::onTextEditing( const String& text, const Int32& start, const Int32& length ) {
+void TerminalDisplay::onTextEditing( const String&, const Int32&, const Int32& ) {
 	if ( !mTerminal )
 		return;
 	invalidateCursor();
@@ -1752,8 +1752,8 @@ void TerminalDisplay::initVBOs() {
 Rectf TerminalDisplay::updateIMELocation() {
 	if ( !Engine::isRunninMainThread() )
 		return {};
-	auto fontSize = mFont->getFontHeight( mFontSize );
-	auto spaceCharAdvanceX = mFont->getGlyph( 'A', mFontSize, false, false ).advance;
+	Float fontSize = mFont->getFontHeight( mFontSize );
+	Float spaceCharAdvanceX = mFont->getGlyph( 'A', mFontSize, false, false ).advance;
 	auto pos = mPosition.floor() + Vector2f( mPadding.Left, mPadding.Top );
 	Rectf r( { pos.x + mCursor.x * spaceCharAdvanceX, pos.y + mCursor.y * fontSize },
 			 { spaceCharAdvanceX, fontSize } );