diff --git a/comp/src/gb.report/.list b/comp/src/gb.report/.list
index 6473d4fbd..e9dd3c532 100644
--- a/comp/src/gb.report/.list
+++ b/comp/src/gb.report/.list
@@ -1,3 +1,6 @@
+Align!?
+Arrange!?
+Line!?
 Report!
 ReportBorder!
 ReportBrush!
diff --git a/comp/src/gb.web/.src/SqliteSessionManager.class b/comp/src/gb.web/.src/SqliteSessionManager.class
index 609d03b4f..fd80a4edb 100644
--- a/comp/src/gb.web/.src/SqliteSessionManager.class
+++ b/comp/src/gb.web/.src/SqliteSessionManager.class
@@ -23,6 +23,7 @@ End
 
 Public Sub _new(sId As String)
   
+  Component.Load("gb.db")
   $sPath = GetPath(sId) '"/tmp/gambas." & System.User.Id &/ "session" &/ $sId
   
 End
@@ -294,7 +295,7 @@ Public Sub _put(Value As Variant, Key As String)
     $cDelete[Key] = True
     $cValues.Remove(Key)
   Else
-    $cDelete.Remove(Key)
+    If $cDelete.Count Then $cDelete.Remove(Key)
     $cValues[Key] = Value
   Endif
   
@@ -337,6 +338,14 @@ Public Sub GetKeys() As String[]
     aKey.Add(rValue!sKey)
   Next
   
+  For Each $cDelete
+    Try aKey.Remove(aKey.Find($cDelete.Key))
+  Next
+  
+  For Each $cValues
+    If Not aKey.Exist($cValues.Key) Then aKey.Add($cValues.Key)
+  Next
+  
   Return aKey
 
 End
diff --git a/main/Makefile.am b/main/Makefile.am
index 7cc66c358..8aa5f3569 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -53,7 +53,7 @@ install-exec-local:
 	      rm -rf .gambas; \
 	      echo "Installing $$p..."; \
 	      $(INSTALL) $$p.gambas $(DESTDIR)$(bindir); \
-	      ln -s $$p.gambas $(DESTDIR)$(bindir)/$$p || true; \
+	      $(LN_S) -f $$p.gambas $(DESTDIR)$(bindir)/$$p || true; \
 	    else \
 	      echo "|| Unable to compile $$p" >> ../../../warnings.log; \
 	    fi \
diff --git a/main/lib/image/image.c b/main/lib/image/image.c
index e8f022a46..938b5552a 100644
--- a/main/lib/image/image.c
+++ b/main/lib/image/image.c
@@ -793,7 +793,7 @@ void IMAGE_make_gray(GB_IMG *img)
 	while (p != pm) 
 	{
 		col = BGRA_from_format(*p, format);
-		g = (((RED(col) + BLUE(col)) >> 1) + GREEN(col)) >> 1;
+		g = GRAY(col);
 		
 		*p++ = BGRA_to_format(RGBA(g, g, g, ALPHA(col)), format);
 	}