diff --git a/spring-all/src/main/webapp/WEB-INF/web.xml b/spring-all/src/main/webapp/WEB-INF/web.xml
index 4e0e7a231c..3ac9e9ed8c 100644
--- a/spring-all/src/main/webapp/WEB-INF/web.xml
+++ b/spring-all/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,11 @@
         <servlet-class>
             org.springframework.web.servlet.DispatcherServlet
         </servlet-class>
-        <load-on-startup>1</load-on-startup>
         <init-param>
             <param-name>contextConfigLocation</param-name>
             <param-value>/WEB-INF/test-mvc.xml</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
 
     <servlet-mapping>
diff --git a/spring-freemarker/pom.xml b/spring-freemarker/pom.xml
index 9bbdbcecfb..51df4e6647 100644
--- a/spring-freemarker/pom.xml
+++ b/spring-freemarker/pom.xml
@@ -77,7 +77,7 @@
 				<configuration>
 					<source>${jdk.version}</source>
 					<target>${jdk.version}</target>
-					<failOnMissingWebXml>true</failOnMissingWebXml>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/spring-freemarker/src/main/webapp/WEB-INF/web.xml b/spring-freemarker/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..a498aef4ad
--- /dev/null
+++ b/spring-freemarker/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
+  <display-name>spring4-freemarker-example</display-name>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+    <welcome-file>default.html</welcome-file>
+    <welcome-file>default.htm</welcome-file>
+    <welcome-file>default.jsp</welcome-file>
+  </welcome-file-list>
+</web-app>
\ No newline at end of file
diff --git a/spring-jpa/src/main/resources/jpaConfig.xml b/spring-jpa/src/main/resources/persistence.xml
similarity index 100%
rename from spring-jpa/src/main/resources/jpaConfig.xml
rename to spring-jpa/src/main/resources/persistence.xml
diff --git a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml
index 88af78dabc..b9e15c7bae 100644
--- a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml
+++ b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml
@@ -5,7 +5,8 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"
 >
 
-    <http access-denied-page="/access-denied.html" use-expressions="true">
+    <http use-expressions="true">
+    	<access-denied-handler error-page="/access-denied.html" />
         <intercept-url pattern="/access-denied*" access="hasAnyRole('ROLE_LOCATION_WRITE','ROLE_POLYGON_WRITE')"/>
         <intercept-url pattern="/admin/**" access="hasAnyRole('ROLE_ADMIN')"/>
         <intercept-url pattern="/organization/**" access="hasAnyRole('ROLE_ORGANIZATION')"/>