--- a/src/screensaverbase.cpp	Tue Sep 14 21:20:26 2010 +0300
+++ b/src/screensaverbase.cpp	Wed Sep 15 12:13:53 2010 +0300
@@ -84,6 +84,7 @@
         {
         SCRLOGGER_WRITE("Model: StopScreenSaver(), exit power save");
         LcdPartialMode()->Exit();
+        Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOn );
         }
     
     CancelTimer();
@@ -175,7 +176,7 @@
             TUint16* addr = ( TUint16* )iOffScrnBmp->DataAddress();
             err = LcdPartialMode()->Set( startLine, endLine, addr, aFullColors );
 
-            Model().SharedDataInterface()->SetSSForcedLightsOn( 0 );
+            Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOff );
             }
         else
             {

--- a/src/screensaverctrlplugin.cpp	Tue Sep 14 21:20:26 2010 +0300
+++ b/src/screensaverctrlplugin.cpp	Wed Sep 15 12:13:53 2010 +0300
@@ -63,8 +63,6 @@
 void CScreensaverCtrlPlugin::StartTimer()
     {
     // Notify plugin that screensaver is starting
-    Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOn );
-    
     SendPluginEvent( EScreensaverEventStarting );
     
     
@@ -284,6 +282,7 @@
     SCRLOGGER_WRITE("Host: ExitPartialMode()");
 
     LcdPartialMode()->Exit();
+    Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOn );
     // Make sure the partial area is empty
     // Make this less idiotic
     TRect psRect( 0, 0, 0, 0);

--- a/src/screensaverutility.cpp	Tue Sep 14 21:20:26 2010 +0300
+++ b/src/screensaverutility.cpp	Wed Sep 15 12:13:53 2010 +0300
@@ -132,7 +132,8 @@
         }
     CAknTransitionUtils::RemoveData( KScreensaverCallStateChange );
 #endif
-
+    CEikonEnv::Static()->RootWin().SetOrdinalPosition(
+                    0, ECoeWinPriorityNeverAtFront );
     CEikonEnv::Static()->BringForwards( EFalse );
     }