Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java
===================================================================
diff -u -rdf67712bc22a94b9af5da6ba10fe6c4557a228fa -r8448034506063ccb94e5e04076ac1ef5380e81f0
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java	(.../AuthoringConstants.java)	(revision df67712bc22a94b9af5da6ba10fe6c4557a228fa)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringConstants.java	(.../AuthoringConstants.java)	(revision 8448034506063ccb94e5e04076ac1ef5380e81f0)
@@ -41,4 +41,5 @@
 	public static final String LAMS_WWW_DIR = "lams-www.war";
 	public static final String LAMS_WWW_FOLDER = "www/";
 	public static final String LAMS_WWW_SECURE_DIR = "secure";
+	public static final String LAMS_LAMS_FOLDER = "lams/";
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
===================================================================
diff -u -rdf67712bc22a94b9af5da6ba10fe6c4557a228fa -r8448034506063ccb94e5e04076ac1ef5380e81f0
--- lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java	(.../LAMSConnectorServlet.java)	(revision df67712bc22a94b9af5da6ba10fe6c4557a228fa)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java	(.../LAMSConnectorServlet.java)	(revision 8448034506063ccb94e5e04076ac1ef5380e81f0)
@@ -126,7 +126,7 @@
 		String currentDirPath=realBaseDir + currentFolderStr;
 		String validCurrentDirPath = currentDirPath.replace('/', File.separatorChar);
 		
-		String currentWebPath= Configuration.get(ConfigurationKeys.SERVER_URL) + AuthoringConstants.LAMS_WWW_FOLDER + AuthoringConstants.LAMS_WWW_SECURE_DIR + currentFolderStr + typeStr + "/";
+		String currentWebPath= "/" + AuthoringConstants.LAMS_LAMS_FOLDER + AuthoringConstants.LAMS_WWW_FOLDER + AuthoringConstants.LAMS_WWW_SECURE_DIR + currentFolderStr + typeStr + "/";
 		
 		File currentContentDir=new File(validCurrentDirPath);
 		if(!currentContentDir.exists()){
Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
===================================================================
diff -u -rdf67712bc22a94b9af5da6ba10fe6c4557a228fa -r8448034506063ccb94e5e04076ac1ef5380e81f0
--- lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java	(.../LAMSUploadServlet.java)	(revision df67712bc22a94b9af5da6ba10fe6c4557a228fa)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java	(.../LAMSUploadServlet.java)	(revision 8448034506063ccb94e5e04076ac1ef5380e81f0)
@@ -151,7 +151,7 @@
 		String currentDirPath=realBaseDir + currentFolderStr;
 		String validCurrentDirPath = currentDirPath.replace('/', File.separatorChar);
 		
-		String currentWebPath= Configuration.get(ConfigurationKeys.SERVER_URL) + AuthoringConstants.LAMS_WWW_FOLDER + AuthoringConstants.LAMS_WWW_SECURE_DIR + currentFolderStr + typeStr;
+		String currentWebPath= "/" + AuthoringConstants.LAMS_LAMS_FOLDER + AuthoringConstants.LAMS_WWW_FOLDER + AuthoringConstants.LAMS_WWW_SECURE_DIR + currentFolderStr + typeStr;
 		
 		File currentContentDir=new File(validCurrentDirPath);
 		if(!currentContentDir.exists()){
Index: lams_central/web/fckeditor/editor/dialog/fck_image.html
===================================================================
diff -u -re31d1853222ec105bcc6293bcc9ab9799dfc685b -r8448034506063ccb94e5e04076ac1ef5380e81f0
--- lams_central/web/fckeditor/editor/dialog/fck_image.html	(.../fck_image.html)	(revision e31d1853222ec105bcc6293bcc9ab9799dfc685b)
+++ lams_central/web/fckeditor/editor/dialog/fck_image.html	(.../fck_image.html)	(revision 8448034506063ccb94e5e04076ac1ef5380e81f0)
@@ -173,8 +173,8 @@
 					<div>
 						<span fcklang="DlgLnkTarget">Target</span><br />
 						<select id="cmbLnkTarget">
-							<option value="" fcklang="DlgGenNotSet" selected="selected">&lt;not set&gt;</option>
-							<option value="_blank" fcklang="DlgLnkTargetBlank">New Window (_blank)</option>
+							<option value="" fcklang="DlgGenNotSet" >&lt;not set&gt;</option>
+							<option value="_blank" fcklang="DlgLnkTargetBlank" selected="selected">New Window (_blank)</option>
 							<option value="_top" fcklang="DlgLnkTargetTop">Topmost Window (_top)</option>
 							<option value="_self" fcklang="DlgLnkTargetSelf">Same Window (_self)</option>
 							<option value="_parent" fcklang="DlgLnkTargetParent">Parent Window (_parent)</option>