diff --git a/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java b/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java
index 02892215a..1bf03d726 100644
--- a/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java
+++ b/src/main/java/org/springframework/data/web/config/HateoasAwareSpringDataWebConfiguration.java
@@ -30,10 +30,10 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
  * @author Oliver Gierke
  */
 @Configuration
-class HateoasAwareSpringDataWebConfiguration extends SpringDataWebConfiguration {
+public class HateoasAwareSpringDataWebConfiguration extends SpringDataWebConfiguration {
 
 	@Bean
-	public PagedResourcesAssembler<?> pagedResourcesAssembler() {
+	public PagedResourcesAssembler<Object> pagedResourcesAssembler() {
 		return new PagedResourcesAssembler<Object>(pageableResolver(), null);
 	}
 
diff --git a/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java b/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java
index 6f6929ec5..b780374c7 100644
--- a/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java
+++ b/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java
@@ -37,10 +37,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
  * @author Oliver Gierke
  */
 @Configuration
-class SpringDataWebConfiguration extends WebMvcConfigurerAdapter {
+public class SpringDataWebConfiguration extends WebMvcConfigurerAdapter {
 
-	@Autowired
-	private ApplicationContext context;
+	@Autowired private ApplicationContext context;
 
 	@Bean
 	public PageableHandlerMethodArgumentResolver pageableResolver() {