diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootBanner.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootBanner.java
index e455786e9627..4807ef4855ab 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootBanner.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootBanner.java
@@ -48,11 +48,8 @@ public void printBanner(Environment environment, Class<?> sourceClass, PrintStre
 		printStream.println();
 		printStream.println(BANNER);
 		String version = String.format(" (v%s)", SpringBootVersion.getVersion());
-		StringBuilder padding = new StringBuilder();
-		while (padding.length() < STRAP_LINE_SIZE - (version.length() + SPRING_BOOT.length())) {
-			padding.append(" ");
-		}
-		printStream.println(AnsiOutput.toString(AnsiColor.GREEN, SPRING_BOOT, AnsiColor.DEFAULT, padding.toString(),
+		String padding = " ".repeat(Math.max(0, STRAP_LINE_SIZE - (version.length() + SPRING_BOOT.length())));
+		printStream.println(AnsiOutput.toString(AnsiColor.GREEN, SPRING_BOOT, AnsiColor.DEFAULT, padding,
 				AnsiStyle.FAINT, version));
 		printStream.println();
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextApplicationContextInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextApplicationContextInitializer.java
index ecaee4c79a5c..257e25ed2451 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextApplicationContextInitializer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextApplicationContextInitializer.java
@@ -83,7 +83,6 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
 	/**
 	 * {@link ApplicationEvent} fired when a parent context is available.
 	 */
-	@SuppressWarnings("serial")
 	public static class ParentContextAvailableEvent extends ApplicationEvent {
 
 		public ParentContextAvailableEvent(ConfigurableApplicationContext applicationContext) {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
index 9aa390f1f6c9..d973135936d1 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
@@ -213,10 +213,7 @@ else if (value instanceof Collection<?> collection) {
 			else if (value instanceof String) {
 				properties.put(name, value);
 			}
-			else if (value instanceof Number) {
-				properties.put(name, value.toString());
-			}
-			else if (value instanceof Boolean) {
+			else if (value instanceof Number || value instanceof Boolean) {
 				properties.put(name, value.toString());
 			}
 			else {