diff --git a/src/eepp/window/engine.cpp b/src/eepp/window/engine.cpp
index 2399cb0ee..72242f239 100755
--- a/src/eepp/window/engine.cpp
+++ b/src/eepp/window/engine.cpp
@@ -56,9 +56,11 @@ Engine::Engine() :
 #if EE_PLATFORM == EE_PLATFORM_ANDROID
 	mZip = eeNew( Zip, () );
 	mZip->open( getPlatformHelper()->getApkPath() );
-#endif
 
+	FileSystem::changeWorkingDirectory( getPlatformHelper()->getExternalStoragePath() );
+#else
 	FileSystem::changeWorkingDirectory( Sys::getProcessPath() );
+#endif
 
 	TextureAtlasManager::createSingleton();
 }
@@ -378,6 +380,7 @@ DisplayManager * Engine::getDisplayManager() {
 	return mDisplayManager;
 }
 
+#if EE_PLATFORM != EE_PLATFORM_ANDROID
 struct EngineInitializer
 {
 	EngineInitializer()
@@ -392,5 +395,6 @@ struct EngineInitializer
 };
 
 EngineInitializer engineInitializer;
+#endif
 
 }}
diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp
index fddea8e68..36c9312de 100644
--- a/src/test/eetest.cpp
+++ b/src/test/eetest.cpp
@@ -556,7 +556,7 @@ void EETest::createBaseUI() {
 	SG->add( TF->loadFromFile( MyPath + "sprites/button-te_mdown.png" ), "button-te_mdown" );
 
 	UISkinSimple nSkin( "button-te" );
-	Sizei screenSize = UIManager::instance()->getMainControl()->getSize();
+	Sizef screenSize = SceneManager::instance()->getUISceneNode()->getSize();
 
 	mShowMenu = UIPushButton::New();
 	mShowMenu->setSkin( nSkin );