diff --git a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertyForm.java b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertyForm.java
index c27c57073..96891d78a 100755
--- a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertyForm.java
+++ b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertyForm.java
@@ -25,7 +25,6 @@ import com.arsdigita.bebop.form.SingleSelect;
 import com.arsdigita.bebop.form.TextField;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.cms.ContentItem;
-import com.arsdigita.cms.ContentSection;
 import com.arsdigita.cms.ContentType;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contentassets.RelatedLink;
@@ -34,11 +33,11 @@ import com.arsdigita.cms.contentassets.util.RelatedLinkGlobalizationUtil;
 import com.arsdigita.cms.contenttypes.Link;
 import com.arsdigita.cms.contenttypes.ui.LinkPropertyForm;
 import com.arsdigita.cms.contenttypes.ui.LinkSelectionModel;
-import com.arsdigita.globalization.GlobalizedMessage;
 import com.arsdigita.mimetypes.MimeType;
 import com.arsdigita.mimetypes.MimeTypeCollection;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.util.Assert;
+
 import org.apache.log4j.Logger;
 
 /**
@@ -215,7 +214,10 @@ public class RelatedLinkPropertyForm extends LinkPropertyForm {
         DataCollection links = RelatedLink.getRelatedLinks(
             getContentItem(fse.getPageState()),
             m_linkListName);
-        rl.setOrder((int) links.size() + 1);
+        //Only change link order if we are creating a new link
+        if (!getLinkSelectionModel().isSelected(fse.getPageState())) {
+            rl.setOrder((int) links.size() + 1);
+        }
 
         super.setLinkProperties(link, fse);
     }
diff --git a/ccm-core/web/themes/foundry/foundry/main.xsl b/ccm-core/web/themes/foundry/foundry/main.xsl
index 88f6dea53..aa3f86f88 100644
--- a/ccm-core/web/themes/foundry/foundry/main.xsl
+++ b/ccm-core/web/themes/foundry/foundry/main.xsl
@@ -72,15 +72,9 @@
     <xsl:function name="foundry:get-current-application">
         <xsl:choose>
             <xsl:when test="$data-tree/@application">
-                <xsl:message>
-                    <xsl:value-of select="concat('Found application ', $data-tree/@application)"/>
-                </xsl:message>
                 <xsl:sequence select="$data-tree/@application"/>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:message>
-                    <xsl:value-of select="'Found no application.'"/>
-                </xsl:message>
                 <xsl:sequence select="'none'"/>
             </xsl:otherwise>
         </xsl:choose>
@@ -89,15 +83,9 @@
     <xsl:function name="foundry:get-current-application-class">
         <xsl:choose>
             <xsl:when test="$data-tree/@class">
-                <xsl:message>
-                    <xsl:value-of select="concat('Found application class ', $data-tree/@class)"/>
-                </xsl:message>
                 <xsl:sequence select="$data-tree/@class"/>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:message>
-                    <xsl:value-of select="'Found no class.'"/>
-                </xsl:message>
                 <xsl:sequence select="'none'"/>
             </xsl:otherwise>
         </xsl:choose>