diff --git a/.gitignore b/.gitignore
index a65b493b21..d202e832bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ iphone/*/*.xcodeproj/*.perspectivev3
 iphone/*/*.xcodeproj/project.xcworkspace/*
 iphone/*/*.xcodeproj/xcuserdata/*
 iphone/*/build/*
-tools/emacsmode/build/*
+tools/emacsmode/build
 
 # GeneratedFiles
 version/version.hpp
@@ -65,5 +65,6 @@ data/settings.ini
 !data/minsk-pass.mwm
 !data/dictionary.slf
 
+
 syntax: regexp
 (.*/)?\#[^/]*\#$
diff --git a/iphone/Maps/Classes/MapViewController.hpp b/iphone/Maps/Classes/MapViewController.hpp
index 6a0f779c5b..71b94b705f 100644
--- a/iphone/Maps/Classes/MapViewController.hpp
+++ b/iphone/Maps/Classes/MapViewController.hpp
@@ -44,4 +44,6 @@ withConfidenceRadius: (double) confidenceRadius
 - (void) OnTerminate;
 - (void) OnEnterBackground;
 
+- (void) Invalidate;
+
 @end
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index d399413eac..426226555c 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -303,6 +303,15 @@ NSInteger compareAddress(UITouch * l, UITouch * r, void * context)
 	[self OnEnterBackground];
 }
 
+- (void) Invalidate
+{
+	if (m_framework)
+	{
+		NSLog(@"invalidate");
+	  m_framework->Invalidate();
+	}
+}
+	
 - (void) OnEnterBackground
 {
 	if (m_framework)
diff --git a/iphone/Maps/Settings/SettingsManager.mm b/iphone/Maps/Settings/SettingsManager.mm
index 1d9aa2dda0..de7942f1ba 100644
--- a/iphone/Maps/Settings/SettingsManager.mm
+++ b/iphone/Maps/Settings/SettingsManager.mm
@@ -84,7 +84,8 @@ using namespace storage;
   {
     g_storage->Unsubscribe();
 		[[g_navController parentViewController] dismissModalViewControllerAnimated:YES];
-  	[g_navController release];
+  	[[g_navController parentViewController] Invalidate];
+		[g_navController release];
     g_navController = nil;
   }
 }
diff --git a/map/framework.hpp b/map/framework.hpp
index 7f74e4e851..d62a383d97 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -111,11 +111,6 @@ class FrameWork
   /// is AddRedrawCommand enabled?
   bool m_isRedrawEnabled;
 
-  void Invalidate()
-  {
-    m_windowHandle->invalidate();
-  }
-
   void AddRedrawCommandSure()
   {
     m_renderQueue.AddCommand(bind(&this_type::PaintImpl, this, _1, _2, _3, _4), m_navigator.Screen());
@@ -249,6 +244,12 @@ public:
   /// Save and load framework state to ini file between sessions.
   //@{
 public:
+
+  void Invalidate()
+  {
+    m_windowHandle->invalidate();
+  }
+
   void SaveState()
   {
     m_navigator.SaveState();
diff --git a/yg/framebuffer.cpp b/yg/framebuffer.cpp
index 16cbe824f6..e3dc68bed0 100644
--- a/yg/framebuffer.cpp
+++ b/yg/framebuffer.cpp
@@ -145,13 +145,13 @@ namespace yg
 #ifdef OMIM_GL_ES
       GLenum res = glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES);
       if (res == GL_FRAMEBUFFER_UNSUPPORTED_OES)
-      {
         LOG(LINFO, ("unsupported combination of attached target formats. could be possibly skipped"));
-      }
-      else if (res != GL_FRAMEBUFFER_COMPLETE_OES)
-      {
-        LOG(LERROR, ("incomplete framebuffer"));
-      }
+      else if (res == GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES)
+        LOG(LINFO, ("incomplete attachement"));
+      else if (res == GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES)
+        LOG(LINFO, ("incomplete missing attachement"));
+      else if (res == GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES)
+        LOG(LINFO, ("incomplete dimensions"));
 #else
       GLenum res = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
       if (res == GL_FRAMEBUFFER_UNSUPPORTED)