diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index d594910f9..504c62d94 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -5,6 +5,10 @@
  - fix [ 1344146 ] deleting recurring events doesn't work
  - fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields
  - fix [ 1377276 ] Calendar Pop up issue
+ - fix [ 1344111 ] promote/demote swap with non-"published" assets
+ - removed server version tag appending.  Could re-add as an setting later.
+   (along with the Style.pm header tag version number insertion).
+ - fixed poll's editForm so an option only showed up at the proper time.
  - Fixed bug/rfe where it was not obvious when hovering over the rank
    column in the Asset Manager that you can drag rows up and down.
    Added cursor:move to the td's style.
diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index 2afb0db0d..0da418251 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -43,7 +43,7 @@ sub handler {
 	my $r = shift;
 	$session{site} = shift || $r->dir_config('WebguiConfig');
 	my $s = Apache2::ServerUtil->server;
-	$s->add_version_component("WebGUI/".$WebGUI::VERSION);
+#	$s->add_version_component("WebGUI/".$WebGUI::VERSION); # had to remove b/c it was appending on every request for that instance of httpd.  :(
 	$session{wguri} = $r->uri;
 	$session{config} = WebGUI::Config::getConfig($s->dir_config('WebguiRoot'),$session{site});
 	### Add Apache Request stuff to global session.  Yes, I know the global hash will eventually be deprecated.
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 1d353d19f..cae35cc44 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -238,7 +238,7 @@ sub getEditForm {
 		-name=>"resetVotes",
 		-label=>WebGUI::International::get(10,"Asset_Poll"),
 		-hoverHelp=>WebGUI::International::get('10 description',"Asset_Poll")
-		);
+		) if $session{form}{func} eq 'add';
 	return $tabform;
 }
 
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index 6d3654aef..f86cf2490 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -116,7 +116,7 @@ sub demote {
 	my $self = shift;
 	my ($sisterLineage) = WebGUI::SQL->quickArray("select min(lineage) from asset 
 		where parentId=".quote($self->get("parentId"))." 
-		and lineage>".quote($self->get("lineage")));
+		and state='published' and lineage>".quote($self->get("lineage")));
 	if (defined $sisterLineage) {
 		$self->swapRank($sisterLineage);
 		$self->{_properties}{lineage} = $sisterLineage;
@@ -529,7 +529,7 @@ sub promote {
 	my $self = shift;
 	my ($sisterLineage) = WebGUI::SQL->quickArray("select max(lineage) from asset 
 		where parentId=".quote($self->get("parentId"))." 
-		and lineage<".quote($self->get("lineage")));
+		and state='published' and lineage<".quote($self->get("lineage")));
 	if (defined $sisterLineage) {
 		$self->swapRank($sisterLineage);
 		$self->{_properties}{lineage} = $sisterLineage;