diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java
index 14f4982683..42baf60a97 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/system/ApplicationPidFileWriter.java
@@ -116,9 +116,10 @@ public class ApplicationPidFileWriter implements
 	/**
 	 * Sets the type of application event that will trigger writing of the PID file.
 	 * Defaults to {@link ApplicationPreparedEvent}. NOTE: If you use the
-	 * {@link ApplicationPreparedEvent} to trigger the write, you will not be able to
+	 * {@link org.springframework.boot.context.event.ApplicationStartedEvent}
+	 * to trigger the write, you will not be able to
 	 * specify the PID filename in the Spring {@link Environment}.
-	 * @param triggerEventType the event trigger type
+	 * @param triggerEventType the trigger event type
 	 */
 	public void setTriggerEventType(
 			Class<? extends SpringApplicationEvent> triggerEventType) {
@@ -189,7 +190,7 @@ public class ApplicationPidFileWriter implements
 	/**
 	 * Provides access to a property value.
 	 */
-	private interface Property {
+	private static interface Property {
 
 		String getValue(SpringApplicationEvent event);
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java b/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
index 3524d5c876..908c857857 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
@@ -34,7 +34,7 @@ public class ApplicationEnvironmentPreparedEvent extends SpringApplicationEvent
 	/**
 	 * Create a new {@link ApplicationEnvironmentPreparedEvent} instance.
 	 * @param application the current application
-	 * @param args the argumemts the application is running with
+	 * @param args the arguments the application is running with
 	 * @param environment the environment that was just created
 	 */
 	public ApplicationEnvironmentPreparedEvent(SpringApplication application,
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationPreparedEvent.java b/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationPreparedEvent.java
index 216b0124c6..949e56da24 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationPreparedEvent.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationPreparedEvent.java
@@ -36,7 +36,7 @@ public class ApplicationPreparedEvent extends SpringApplicationEvent {
 	/**
 	 * Create a new {@link ApplicationPreparedEvent} instance.
 	 * @param application the current application
-	 * @param args the argumemts the application is running with
+	 * @param args the arguments the application is running with
 	 * @param context the ApplicationContext about to be refreshed
 	 */
 	public ApplicationPreparedEvent(SpringApplication application, String[] args,
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java b/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java
index 71c1138dc1..43d64aa4cd 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationReadyEvent.java
@@ -38,7 +38,7 @@ public class ApplicationReadyEvent extends SpringApplicationEvent {
 	 * Create a new {@link ApplicationReadyEvent} instance.
 	 * @param application the current application
 	 * @param args the arguments the application is running with
-	 * @param context the context that was being created (maybe null)
+	 * @param context the context that was being created
 	 */
 	public ApplicationReadyEvent(SpringApplication application, String[] args,
 			ConfigurableApplicationContext context) {