diff --git a/build.properties b/build.properties
index 158d9238..65e41a0c 100644
--- a/build.properties
+++ b/build.properties
@@ -5,6 +5,7 @@ project.key=SWF
 ivy.cache.dir=${basedir}/../ivy-cache
 integration.repo.dir=${basedir}/../integration-repo
 source.version=1.4
+javadoc.exclude.package.names=org/springframework/webflow/samples/**
 
 # For when releasing
 #release.type=release
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java
index f116a781..b6ab0878 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java
@@ -45,7 +45,7 @@ public class DefaultELResolver extends CompositeELResolver {
 	/**
 	 * Creates a new default EL resolver for resolving properties of the root object. Assumes a null target and expect
 	 * that the base object has already been resolved by the time this resolver runs.
-	 * @customResolvers the custom resolvers to apply before this resolver
+	 * @param customResolvers the custom resolvers to apply before this resolver
 	 */
 	public DefaultELResolver(List customResolvers) {
 		this(null, customResolvers);
@@ -54,7 +54,7 @@ public class DefaultELResolver extends CompositeELResolver {
 	/**
 	 * Creates a new default EL resolver for resolving properties of the root object.
 	 * @param target the target, or "root", object of the expression
-	 * @customResolvers the custom resolvers to apply before this resolver
+	 * @param customResolvers the custom resolvers to apply before this resolver
 	 */
 	public DefaultELResolver(Object target, List customResolvers) {
 		this.target = target;
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java
index 7945d5f8..11291621 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java
@@ -28,6 +28,7 @@ import javax.faces.component.UIParameter;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.event.ActionEvent;
+import javax.faces.render.Renderer;
 
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java
index 0430e1fd..477ba602 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
+import javax.faces.render.Renderer;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.faces.webflow.JsfUtils;
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java
index b2b5329f..0147e48f 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java
@@ -22,6 +22,7 @@ import javax.faces.component.UICommand;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
+import javax.faces.render.Renderer;
 
 /**
  * {@link Renderer} for the {@code <sf:validateAllOnClick>} tag.
diff --git a/spring-webflow-samples/booking-mvc/ivy.xml b/spring-webflow-samples/booking-mvc/ivy.xml
index 3be79036..da3e2ceb 100755
--- a/spring-webflow-samples/booking-mvc/ivy.xml
+++ b/spring-webflow-samples/booking-mvc/ivy.xml
@@ -23,6 +23,7 @@
 		<!-- core dependencies -->
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="compile->compile"/>
 		<dependency	org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
+		<dependency	org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.1.0" conf="provided->compile"/>
 		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2" conf="compile->compile"/>
 		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="compile->compile"/>				
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="compile->compile"/>
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java b/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java
index cfd4c129..a2fc3ea3 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java
@@ -23,8 +23,7 @@ import org.springframework.core.Ordered;
 import org.springframework.webflow.execution.ScopeType;
 
 /**
- * Registers the Spring Web Flow bean scopes with a
- * @{link ConfigurableListableBeanFactory}.
+ * Registers the Spring Web Flow bean scopes with a {@link ConfigurableListableBeanFactory}.
  * 
  * @author Ben Hale
  * @see Scope