diff --git a/src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java b/src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java
index ed32a2d..6a6aae2 100644
--- a/src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java
+++ b/src/main/java/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java
@@ -50,7 +50,7 @@ public abstract class AppleImage {
 		String[] classNames = {
 			"ImageIoImage", "SunJpegImage", "SwtImage" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		Class<?>[] constructorArgClasses = new Class<?>[] { int.class, int.class };
-		Object[] constructorArgs = { new Integer(width), new Integer(height) };
+		Object[] constructorArgs = { Integer.valueOf(width), Integer.valueOf(height) };
 		for (String className : classNames) {
 			try {
 				Class<?> appleImageClass = Class.forName(
diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java
index dc3b7c2..aef080f 100644
--- a/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java
+++ b/src/main/java/com/webcodepro/applecommander/storage/os/cpm/CpmFileEntry.java
@@ -112,7 +112,7 @@ public class CpmFileEntry implements FileEntry {
 	 * Add another directory offset to this file entry.
 	 */
 	public void addOffset(int offset) {
-		offsets.add(new Integer(offset));
+		offsets.add(Integer.valueOf(offset));
 	}
 
 	/**
diff --git a/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java b/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java
index 14ba7e0..5d73aa8 100644
--- a/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java
+++ b/src/main/java/com/webcodepro/applecommander/storage/os/dos33/DosFileEntry.java
@@ -484,7 +484,7 @@ public class DosFileEntry implements FileEntry {
 		try {
 			byte[] rawdata = disk.getFileData(this);
 			if (rawdata == null || rawdata.length == 0) {
-				this.address = new Integer(address);
+				this.address = Integer.valueOf(address);
 			} else {
 				AppleUtil.setWordValue(rawdata, 0, address);
 				disk.setFileData(this, rawdata);