diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java
index 3b838ecf1..833836732 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java	
@@ -3,20 +3,18 @@ package org.owasp.webgoat.lessons;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
-import java.sql.Statement;
 
 import org.apache.ecs.Element;
 import org.apache.ecs.ElementContainer;
 import org.apache.ecs.StringElement;
-import org.apache.ecs.html.H2;
-import org.apache.ecs.html.IMG;
-import org.apache.ecs.html.PRE;
-import org.apache.ecs.html.Span;
-import org.apache.ecs.html.Div;
-import org.apache.ecs.html.Input;
 import org.apache.ecs.html.BR;
+import org.apache.ecs.html.Div;
+import org.apache.ecs.html.IMG;
+import org.apache.ecs.html.Input;
+import org.apache.ecs.html.PRE;
 import org.apache.ecs.html.TD;
 import org.apache.ecs.html.TR;
 import org.apache.ecs.html.Table;
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java
index 0535fc90a..82a9e64c7 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java	
@@ -10,7 +10,6 @@ import java.util.List;
 import org.apache.ecs.Element;
 import org.apache.ecs.ElementContainer;
 import org.apache.ecs.StringElement;
-import org.apache.ecs.html.A;
 import org.apache.ecs.html.B;
 import org.apache.ecs.html.H1;
 import org.apache.ecs.html.HR;
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java
index 5fd0581ce..32d33cd65 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java	
@@ -79,7 +79,7 @@ public abstract class LessonAdapter extends AbstractLesson
 		.addElement(new StringElement(
 			"Lesson are simple to create and very little coding is required.   "
 				+ "In fact, most lessons can be created by following the easy to use instructions in the "
-				+ "<A HREF=http://prdownloads.sourceforge.net/owasp/WebGoatVersion2UserGuide.pdf?download>WebGoat User Guide.</A>&nbsp;&nbsp;"
+				+ "<A HREF=http://www.owasp.org/index.php/WebGoat_User_and_Install_Guide_Table_of_Contents>WebGoat User Guide.</A>&nbsp;&nbsp;"
 				+ "If you would prefer, send your lesson ideas to "
 				+ s.getFeedbackAddress()));
 
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java
index d7c893bd2..0d726e30c 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java	
@@ -67,7 +67,7 @@ public class NewLesson extends LessonAdapter
     	return GENERAL;
     }
 
-    private final static Integer DEFAULT_RANKING = new Integer(5);
+    private final static Integer DEFAULT_RANKING = new Integer(85);
 
 
     protected Integer getDefaultRanking()
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java
index f4ff93000..8a8924b05 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java	
@@ -2,14 +2,14 @@ package org.owasp.webgoat.lessons;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
 import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 
 import org.apache.ecs.Element;
 import org.apache.ecs.ElementContainer;
+import org.apache.ecs.StringElement;
 import org.apache.ecs.html.BR;
+import org.apache.ecs.html.Div;
 import org.apache.ecs.html.Form;
 import org.apache.ecs.html.H1;
 import org.apache.ecs.html.H3;
@@ -18,10 +18,6 @@ import org.apache.ecs.html.Input;
 import org.apache.ecs.html.TD;
 import org.apache.ecs.html.TR;
 import org.apache.ecs.html.Table;
-import org.apache.ecs.html.Div;
-import org.apache.ecs.vxml.Initial;
-import org.apache.ecs.StringElement;
-
 import org.owasp.webgoat.session.WebSession;
 
 /*******************************************************************************
diff --git a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/CrossSiteScripting.jsp b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/CrossSiteScripting.jsp
index 278ca864f..a571c370c 100644
--- a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/CrossSiteScripting.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/CrossSiteScripting.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.*" 
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.CrossSiteScripting" 
 	errorPage="" %>
 <style>
 <jsp:include page="CrossSiteScripting.css" />
diff --git a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/EditProfile.jsp b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/EditProfile.jsp
index bf94f1c02..09a8fe77a 100644
--- a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/EditProfile.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/EditProfile.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.*" 
+	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.CrossSiteScripting" 
 	errorPage="" %>
 <%
 	WebSession webSession = ((WebSession)session.getAttribute("websession"));
diff --git a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/ListStaff.jsp b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/ListStaff.jsp
index fcb862d4e..d4cf38d1e 100644
--- a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/ListStaff.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/ListStaff.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.*" 
+	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.CrossSiteScripting" 
 	errorPage="" %>
 <%
 	WebSession webSession = ((WebSession)session.getAttribute("websession"));
diff --git a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/Login.jsp b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/Login.jsp
index 15b679d96..085019341 100644
--- a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/Login.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/Login.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.*" 
+	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.CrossSiteScripting" 
 	errorPage="" %>
 	<div id="lesson_login">
 		<div id="lesson_login_txt">
diff --git a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/SearchStaff.jsp b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/SearchStaff.jsp
index 6aee0e043..83ceee0ca 100644
--- a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/SearchStaff.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/SearchStaff.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.*" 
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.CrossSiteScripting" 
 	errorPage="" %>
 	<div id="lesson_search">
 			<% 
diff --git a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/ViewProfile.jsp b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/ViewProfile.jsp
index 0b719dab6..65861cef7 100644
--- a/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/ViewProfile.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/CrossSiteScripting/ViewProfile.jsp	
@@ -2,7 +2,7 @@
 STAGE 4 FIXES Look for the <-- STAGE 4 - FIX
 -->
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.*" errorPage="" %>
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.CrossSiteScripting.CrossSiteScripting" errorPage="" %>
 <%
 WebSession webSession = ((WebSession)session.getAttribute("websession"));
 	Employee employee = (Employee) session.getAttribute("CrossSiteScripting." + CrossSiteScripting.EMPLOYEE_ATTRIBUTE_KEY);
@@ -136,7 +136,7 @@ WebSession webSession = ((WebSession)session.getAttribute("websession"));
 					%>			
 					</td>
                     <td width="60">
-					<%					
+					<%
 					if (webSession.isAuthorizedInLesson(webSession.getUserIdInLesson(), CrossSiteScripting.DELETEPROFILE_ACTION))
 					{
 					%>
diff --git a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/EditProfile.jsp b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/EditProfile.jsp
index d407ec821..806804954 100644
--- a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/EditProfile.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/EditProfile.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.*" 
+	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.RoleBasedAccessControl" 
 	errorPage="" %>
 <%
 	WebSession webSession = ((WebSession)session.getAttribute("websession"));
diff --git a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/ListStaff.jsp b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/ListStaff.jsp
index 8a1e3edbf..8f6283b0a 100644
--- a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/ListStaff.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/ListStaff.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.*" 
+	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.RoleBasedAccessControl" 
 	errorPage="" %>
 <%
 	WebSession webSession = ((WebSession)session.getAttribute("websession"));
diff --git a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/Login.jsp b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/Login.jsp
index 4550556de..edb3f8c1a 100644
--- a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/Login.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/Login.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.*" 
+	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.RoleBasedAccessControl" 
 	errorPage="" %>
 	<div id="lesson_login">
 		<div id="lesson_login_txt">
diff --git a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp
index 979cfb569..7afc1c789 100644
--- a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/RoleBasedAccessControl.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.*" 
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.RoleBasedAccessControl" 
 	errorPage="" %>
 <style>
 <jsp:include page="RoleBasedAccessControl.css" />
diff --git a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/SearchStaff.jsp b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/SearchStaff.jsp
index 615c45b7a..a5b53c530 100644
--- a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/SearchStaff.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/SearchStaff.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.*" 
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.RoleBasedAccessControl" 
 	errorPage="" %>
 	<div id="lesson_search">
 			<% 
diff --git a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/ViewProfile.jsp b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/ViewProfile.jsp
index 81d211ca4..8029450b6 100644
--- a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/ViewProfile.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/ViewProfile.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.*" 
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.RoleBasedAccessControl" 
 	errorPage="" %>
 <%
 	Employee employee = (Employee) session.getAttribute("RoleBasedAccessControl." + RoleBasedAccessControl.EMPLOYEE_ATTRIBUTE_KEY);
diff --git a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/error.jsp b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/error.jsp
index 9c4caeac6..fd541a0ef 100644
--- a/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/error.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/RoleBasedAccessControl/error.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.*"
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.RoleBasedAccessControl.RoleBasedAccessControl"
 	errorPage="" %>
 <%
 	WebSession webSession = ((WebSession)session.getAttribute("websession"));
@@ -9,5 +9,5 @@
 <br><br><br>
 <form method="POST" action="attack?menu=<%=webSession.getCurrentMenu()%>">
 
-	<input type="submit" name="action" value="<%=RoleBasedAccessControl.LOGIN_ACTION%>"/>
+ <input type="submit" name="action" value="<%=RoleBasedAccessControl.LOGIN_ACTION%>"/>
 </form>
\ No newline at end of file
diff --git a/ webgoat/main/project/WebContent/lessons/SQLInjection/EditProfile.jsp b/ webgoat/main/project/WebContent/lessons/SQLInjection/EditProfile.jsp
index 70adf2c1d..158b58c9b 100644
--- a/ webgoat/main/project/WebContent/lessons/SQLInjection/EditProfile.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/SQLInjection/EditProfile.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.*" 
+	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.SQLInjection" 
 	errorPage="" %>
 <%
 	WebSession webSession = ((WebSession)session.getAttribute("websession"));
diff --git a/ webgoat/main/project/WebContent/lessons/SQLInjection/ListStaff.jsp b/ webgoat/main/project/WebContent/lessons/SQLInjection/ListStaff.jsp
index e58dba86b..d89d3fb3e 100644
--- a/ webgoat/main/project/WebContent/lessons/SQLInjection/ListStaff.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/SQLInjection/ListStaff.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.*" 
+	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.SQLInjection" 
 	errorPage="" %>
 <%
 	WebSession webSession = ((WebSession)session.getAttribute("websession"));
diff --git a/ webgoat/main/project/WebContent/lessons/SQLInjection/Login.jsp b/ webgoat/main/project/WebContent/lessons/SQLInjection/Login.jsp
index 59a2f2ae3..a2ca81021 100644
--- a/ webgoat/main/project/WebContent/lessons/SQLInjection/Login.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/SQLInjection/Login.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.*" 
+	import="java.util.*, org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.SQLInjection" 
 	errorPage="" %>
 	<div id="lesson_login">
 		<div id="lesson_login_txt">
diff --git a/ webgoat/main/project/WebContent/lessons/SQLInjection/SQLInjection.jsp b/ webgoat/main/project/WebContent/lessons/SQLInjection/SQLInjection.jsp
index b5da130e8..51dbc4f3f 100644
--- a/ webgoat/main/project/WebContent/lessons/SQLInjection/SQLInjection.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/SQLInjection/SQLInjection.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.*" 
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.SQLInjection" 
 	errorPage="" %>
 <style>
 <jsp:include page="SQLInjection.css" />
diff --git a/ webgoat/main/project/WebContent/lessons/SQLInjection/SearchStaff.jsp b/ webgoat/main/project/WebContent/lessons/SQLInjection/SearchStaff.jsp
index c30bd53ab..325ea213c 100644
--- a/ webgoat/main/project/WebContent/lessons/SQLInjection/SearchStaff.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/SQLInjection/SearchStaff.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.*" 
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.SQLInjection" 
 	errorPage="" %>
 	<div id="lesson_search">
 			<% 
diff --git a/ webgoat/main/project/WebContent/lessons/SQLInjection/ViewProfile.jsp b/ webgoat/main/project/WebContent/lessons/SQLInjection/ViewProfile.jsp
index eaabd5a9d..656758ae0 100644
--- a/ webgoat/main/project/WebContent/lessons/SQLInjection/ViewProfile.jsp	
+++ b/ webgoat/main/project/WebContent/lessons/SQLInjection/ViewProfile.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.*" 
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.SQLInjection.SQLInjection" 
 	errorPage="" %>
 <%
 	WebSession webSession = ((WebSession)session.getAttribute("websession"));
diff --git a/ webgoat/main/project/WebContent/main.jsp b/ webgoat/main/project/WebContent/main.jsp
index 27d11efa3..81ccea007 100644
--- a/ webgoat/main/project/WebContent/main.jsp	
+++ b/ webgoat/main/project/WebContent/main.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.*, java.util.*" 
+	import="org.owasp.webgoat.session.*, org.owasp.webgoat.lessons.Category, org.owasp.webgoat.lessons.AbstractLesson, java.util.*" 
 	errorPage=""  %>
 <%
 Course course = ((Course)session.getAttribute("course"));
diff --git a/ webgoat/main/project/WebContent/sideWindow.jsp b/ webgoat/main/project/WebContent/sideWindow.jsp
index 4ffa465ae..b9766a0a6 100644
--- a/ webgoat/main/project/WebContent/sideWindow.jsp	
+++ b/ webgoat/main/project/WebContent/sideWindow.jsp	
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html; charset=ISO-8859-1" language="java" 
-	import="org.owasp.webgoat.session.*" 
+	import="org.owasp.webgoat.session.WebSession" 
 	errorPage="" %>
 
 <%