diff --git a/README.adoc b/README.adoc
index 98f4ac6850..e803cb0697 100755
--- a/README.adoc
+++ b/README.adoc
@@ -239,7 +239,7 @@ link:spring-boot-project/spring-boot-tools/spring-boot-maven-plugin[Maven] plugi
 
 
 === spring-boot-devtools
-The spring-boot-devtools module provides additional development-time features such as automatic retarts,
+The spring-boot-devtools module provides additional development-time features such as automatic restarts,
 for a smoother application development experience. Developer tools are automatically disabled when
 running a fully packaged application.
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
index fd5d11a1c5..c5933ff074 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
@@ -57,9 +57,9 @@ public class RandomAccessDataFile implements RandomAccessData {
 	 * @param length the length of the section
 	 */
 	private RandomAccessDataFile(FileAccess fileAccess, long offset, long length) {
+		this.fileAccess = fileAccess;
 		this.offset = offset;
 		this.length = length;
-		this.fileAccess = fileAccess;
 	}
 
 	/**
@@ -120,7 +120,7 @@ public class RandomAccessDataFile implements RandomAccessData {
 	}
 
 	/**
-	 * {@link RandomAccessDataInputStream} implementation for the
+	 * {@link InputStream} implementation for the
 	 * {@link RandomAccessDataFile}.
 	 */
 	private class DataInputStream extends InputStream {
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java
index ea4553e9c3..5920a31b3d 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java
@@ -679,22 +679,22 @@ public class MapBinderTests {
 
 	public static class ExampleCustomNoDefaultConstructorBean {
 
-		private MyCustomNoDefaultConstructorList items = new MyCustomNoDefaultConstructorList(
+		private MyCustomNoDefaultConstructorMap items = new MyCustomNoDefaultConstructorMap(
 				Collections.singletonMap("foo", "bar"));
 
-		public MyCustomNoDefaultConstructorList getItems() {
+		public MyCustomNoDefaultConstructorMap getItems() {
 			return this.items;
 		}
 
-		public void setItems(MyCustomNoDefaultConstructorList items) {
+		public void setItems(MyCustomNoDefaultConstructorMap items) {
 			this.items = items;
 		}
 
 	}
 
-	public static class MyCustomNoDefaultConstructorList extends HashMap<String, String> {
+	public static class MyCustomNoDefaultConstructorMap extends HashMap<String, String> {
 
-		public MyCustomNoDefaultConstructorList(Map<String, String> items) {
+		public MyCustomNoDefaultConstructorMap(Map<String, String> items) {
 			putAll(items);
 		}
 
@@ -702,20 +702,20 @@ public class MapBinderTests {
 
 	public static class ExampleCustomWithDefaultConstructorBean {
 
-		private MyCustomWithDefaultConstructorList items = new MyCustomWithDefaultConstructorList();
+		private MyCustomWithDefaultConstructorMap items = new MyCustomWithDefaultConstructorMap();
 
-		public MyCustomWithDefaultConstructorList getItems() {
+		public MyCustomWithDefaultConstructorMap getItems() {
 			return this.items;
 		}
 
-		public void setItems(MyCustomWithDefaultConstructorList items) {
+		public void setItems(MyCustomWithDefaultConstructorMap items) {
 			this.items.clear();
 			this.items.putAll(items);
 		}
 
 	}
 
-	public static class MyCustomWithDefaultConstructorList
+	public static class MyCustomWithDefaultConstructorMap
 			extends HashMap<String, String> {
 
 	}