diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index a6cc978c7..3996f6d56 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,6 +1,11 @@
 6.8.1
  - Removed duplicate processing of metadata.
  - fix [ 1373649 ] Username isn't populated in 6.8.0 Discussions
+ - fix [ 1373707 ] File Pile not uploading images
+ - fix [ 1353425 ] getUsersInGroup includes expired Group of group members (Ed
+   van Duinen)
+ - fix [ 1373041 ] context menus in Admin Mode don't position correctly in IE
+   ( Michele Dell'Aquila)
  - Upgraded TinyMCE to 2.0.1, which allows the rich editor to work with
    Firefox 1.5.
  - Added test class for User.pm (Roy Johnson / Ocean View Web Creations)
diff --git a/docs/credits.txt b/docs/credits.txt
index 057593996..dd2a63409 100644
--- a/docs/credits.txt
+++ b/docs/credits.txt
@@ -14,6 +14,7 @@ Contributing Developers..............Peter Beardsley / Appropriate Solutions
                                      Richard Clark
                                      Doug Collinge
                                      Flavio Curti
+                                     Michele Dell'Aquila / CSU
                                      Jeff Depons / Adaptive Dynamics
                                      Frank Dillon / Plain Black
                                      Arne Dokken
@@ -23,7 +24,7 @@ Contributing Developers..............Peter Beardsley / Appropriate Solutions
                                      Chris Gebhardt / OpenServe
                                      Andy Grundman
                                      Chris Jackson
-                                     Roy Johnson / Ocean View Creations
+                                     Roy Johnson / Ocean View Web Creations
                                      Koen de Jonge / ProcoliX
                                      Martin Kamerbeek / ProcoliX
                                      Christian Kocourek
diff --git a/lib/WebGUI/Asset/FilePile.pm b/lib/WebGUI/Asset/FilePile.pm
index bc6715525..35244d257 100644
--- a/lib/WebGUI/Asset/FilePile.pm
+++ b/lib/WebGUI/Asset/FilePile.pm
@@ -179,6 +179,7 @@ sub editSave {
 		delete $newAsset->{_storageLocation};
 		$newAsset->setSize($storage->getFileSize($filename));
 		$newAsset->generateThumbnail if ($className eq "WebGUI::Asset::File::Image");
+		$newAsset->commit;
 	}
 	$tempStorage->delete;
 	return $class->getParent->www_manageAssets if ($session{form}{proceed} eq "manageAssets");
diff --git a/lib/WebGUI/Grouping.pm b/lib/WebGUI/Grouping.pm
index 370015afc..ef449a65e 100755
--- a/lib/WebGUI/Grouping.pm
+++ b/lib/WebGUI/Grouping.pm
@@ -320,10 +320,16 @@ sub getUsersInGroup {
 		$clause = "expireDate > ".time()." and ";
 	}
 	$clause .= "(groupId=".quote($groupId);
-	if ($recursive) {
+ 	if ($recursive) {
 		my $groups = getGroupsInGroup($groupId,1);
 		if ($#$groups >= 0) {
-			$clause .= " or groupId in (".quoteAndJoin($groups).")";
+			if ($withoutExpired) {
+				foreach my $groupId (@$groups) {
+					$clause .= " OR (groupId = ".quote($groupId)." AND expireDate > ".time().") ";
+				}
+			} else {
+				$clause .= " OR groupId IN (".quoteAndJoin(',',@$groups).")";
+			}
 		}
 	}
 	$clause .= ")";
diff --git a/www/extras/contextMenu/contextMenu.js b/www/extras/contextMenu/contextMenu.js
index 1fdda0cf0..a2140bfd0 100755
--- a/www/extras/contextMenu/contextMenu.js
+++ b/www/extras/contextMenu/contextMenu.js
@@ -30,8 +30,9 @@ var firedobj = ie5?e.srcElement:e.target;
                 yoffset+=firedobj.offsetTop;}
             firedobj=firedobj.offsetParent;
    }
-		posx = e.clientX - xoffset + (ie5? document.body.scrollLeft : window.pageXOffset);
-		posy = e.clientY - yoffset + (ie5? document.body.scrollTop : window.pageYOffset);
+		var el = document.documentElement;
+               posx = e.clientX - xoffset + (ie5? el.scrollLeft : window.pageXOffset);
+               posy = e.clientY - yoffset + (ie5? el.scrollTop : window.pageYOffset);
 	menuobj.style.left=posx;
 	menuobj.style.top=posy;
       menuobj.style.visibility="visible"