diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointServlet.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointServlet.java
index a3abd5e9ae..680ffbae19 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointServlet.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointServlet.java
@@ -21,7 +21,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.servlet.Servlet;
-import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.Assert;
@@ -86,7 +86,7 @@ public final class EndpointServlet {
 	 * @return a new instance of {@link EndpointServlet} with the provided
 	 * {@code loadOnStartup} value set
 	 * @since 2.2.0
-	 * @see ServletRegistration.Dynamic#setLoadOnStartup(int)
+	 * @see Dynamic#setLoadOnStartup(int)
 	 */
 	public EndpointServlet withLoadOnStartup(int loadOnStartup) {
 		return new EndpointServlet(this.servlet, this.initParameters, loadOnStartup);
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ConstructorParametersBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ConstructorParametersBinder.java
index 2345832097..af19f3a58a 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ConstructorParametersBinder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ConstructorParametersBinder.java
@@ -55,6 +55,7 @@ class ConstructorParametersBinder implements BeanBinder {
 	}
 
 	@Override
+	@SuppressWarnings("unchecked")
 	public <T> T bind(ConfigurationPropertyName name, Bindable<T> target,
 			Binder.Context context, BeanPropertyBinder propertyBinder) {
 		Bean bean = Bean.get(target);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
index 833e7664d6..2c0557a655 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
@@ -1195,7 +1195,7 @@ public class ConfigurationPropertiesTests {
 	@EnableConfigurationProperties(WithCustomValidatorProperties.class)
 	static class WithCustomValidatorConfiguration {
 
-		@Bean(name = ConfigurationPropertiesBindingPostProcessor.VALIDATOR_BEAN_NAME)
+		@Bean(name = ConfigurationPropertiesBindingPostProcessorRegistrar.VALIDATOR_BEAN_NAME)
 		public CustomPropertiesValidator validator() {
 			return new CustomPropertiesValidator();
 		}
@@ -1206,7 +1206,7 @@ public class ConfigurationPropertiesTests {
 	@EnableConfigurationProperties(WithSetterThatThrowsValidationExceptionProperties.class)
 	static class WithUnsupportedCustomValidatorConfiguration {
 
-		@Bean(name = ConfigurationPropertiesBindingPostProcessor.VALIDATOR_BEAN_NAME)
+		@Bean(name = ConfigurationPropertiesBindingPostProcessorRegistrar.VALIDATOR_BEAN_NAME)
 		public CustomPropertiesValidator validator() {
 			return new CustomPropertiesValidator();
 		}
@@ -1823,7 +1823,7 @@ public class ConfigurationPropertiesTests {
 	@ConfigurationProperties(prefix = "test")
 	static class OtherInjectedProperties {
 
-		private final DataSizeProperties dataSizeProperties;
+		final DataSizeProperties dataSizeProperties;
 
 		@Autowired
 		OtherInjectedProperties(ObjectProvider<DataSizeProperties> dataSizeProperties) {