diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java
index 1318d9eab..fa466b0ef 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java	
@@ -183,7 +183,7 @@ public class Challenge2Screen extends LessonAdapter
 		// pull the USER_COOKIE from the cookies
 		String user = getCookie(s);
 		String query = "SELECT * FROM user_data WHERE last_name = '" + user +"'";
-		Vector v = new Vector();
+		Vector<String> v = new Vector<String>();
 		try 
 		{ 
 			ResultSet results = statement3.executeQuery( query );
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java
index 71710e367..fd9fc759c 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/ListStaff.java	
@@ -48,7 +48,7 @@ public class ListStaff extends DefaultLessonAction
 	{
 		// Query the database for all employees "owned" by the given employee
 		
-		List employees = new Vector();
+		List<EmployeeStub> employees = new Vector<EmployeeStub>();
 		
 		try
 		{
@@ -92,7 +92,7 @@ public class ListStaff extends DefaultLessonAction
 	{
 		// Query the database for all employees "owned" by the given employee
 		
-		List employees = new Vector();
+		List<EmployeeStub> employees = new Vector<EmployeeStub>();
 		
 		try
 		{
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/Login.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/Login.java
index 76fcab5eb..bd296e39a 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/Login.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/Login.java	
@@ -166,7 +166,7 @@ public class Login extends DefaultLessonAction
 	
 	public List getAllEmployees(WebSession s)
 	{
-		List employees = new Vector();
+		List<EmployeeStub> employees = new Vector<EmployeeStub>();
 		
 		// Query the database for all roles the given employee belongs to
 		// Query the database for all employees "owned" by these roles
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java
index 899b0d9ef..fe9f98ac2 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java	
@@ -70,7 +70,7 @@ public class StoredXss extends LessonAdapter
 			statement.setString(2, title);
 			statement.setString(3, message);
 			statement.setString(4, s.getUserName());
-			ResultSet results = statement.executeQuery();
+			statement.executeQuery();
 		}
 		catch ( Exception e )
 		{
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java
index 59afa59f7..49af78b66 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java	
@@ -103,7 +103,7 @@ public class ViewDatabase extends LessonAdapter
 	 */
 	protected List getHints()
 	{
-		List hints = new ArrayList();
+		List<String> hints = new ArrayList<String>();
 		hints.add( "There are no hints defined" );
 
 		return hints;