diff --git a/include/eepp/ui/uiwindow.hpp b/include/eepp/ui/uiwindow.hpp
index 6790d883e..d8ac262ac 100644
--- a/include/eepp/ui/uiwindow.hpp
+++ b/include/eepp/ui/uiwindow.hpp
@@ -63,7 +63,7 @@ class EE_API UIWindow : public UIWidget {
 
 		UIWindow * setSizeWithDecoration( const Sizef& size );
 
-		const Sizef& getSize();
+		const Sizef& getSize() const;
 
 		virtual void setTheme( UITheme * Theme );
 
@@ -229,7 +229,7 @@ class EE_API UIWindow : public UIWidget {
 
 		void fixTitleSize();
 
-		Uint32 onMouseDoubleClick( const Vector2i &position, const Uint32 flags );
+		Uint32 onMouseDoubleClick( const Vector2i &position, const Uint32& flags );
 
 		void checkShortcuts( const Uint32& KeyCode, const Uint32& Mod );
 
diff --git a/projects/android-project/app/jni/Application.mk b/projects/android-project/app/jni/Application.mk
index 4a2e2dd54..158146c26 100644
--- a/projects/android-project/app/jni/Application.mk
+++ b/projects/android-project/app/jni/Application.mk
@@ -11,12 +11,12 @@ APP_LDLIBS				:= -llog $(EE_GLES_LINK) -lm -lz -lOpenSLES -lEGL -landroid
 
 #Debug Build
 #APP_CFLAGS				:= -g -DDEBUG -DEE_DEBUG
-#APP_CPPFLAGS			:= -std=c++11 -frtti -fexceptions
+#APP_CPPFLAGS			:= -std=c++14 -frtti -fexceptions
 #APP_OPTIM 				:= debug
 
 #Release Build
 APP_CFLAGS				:= -fno-strict-aliasing -O3 -s -DNDEBUG -ffast-math
-APP_CPPFLAGS			:= -std=c++11 -frtti -fexceptions
+APP_CPPFLAGS			:= -std=c++14 -frtti -fexceptions
 
 APP_PLATFORM			:= android-14
 APP_MODULES				:= main
diff --git a/src/eepp/ui/uiwindow.cpp b/src/eepp/ui/uiwindow.cpp
index 0a32bb4ba..ab19925bc 100644
--- a/src/eepp/ui/uiwindow.cpp
+++ b/src/eepp/ui/uiwindow.cpp
@@ -585,7 +585,7 @@ UIWindow *UIWindow::setSizeWithDecoration( const Sizef & size ) {
 	return this;
 }
 
-const Sizef& UIWindow::getSize() {
+const Sizef& UIWindow::getSize() const {
 	return UIWidget::getSize();
 }
 
@@ -1124,7 +1124,7 @@ void UIWindow::maximize() {
 	}
 }
 
-Uint32 UIWindow::onMouseDoubleClick( const Vector2i &, const Uint32 Flags ) {
+Uint32 UIWindow::onMouseDoubleClick( const Vector2i &, const Uint32 & Flags ) {
 	if ( isResizeable() && ( NULL != mButtonMaximize ) && ( Flags & EE_BUTTON_LMASK ) ) {
 		maximize();