Fixed some references to contextPath