diff --git a/pom.xml b/pom.xml
index 6890796..62e7a5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
 							</jre>
 							<splash>
 								<file>target/classes/PCUGameManager.bmp</file>
+								<waitForWindow>true</waitForWindow>
 								<timeout>30</timeout>
 							</splash>
 							<icon>target/classes/Icon.ico</icon>
diff --git a/src/main/java/se/lantz/gamebase/GamebaseImporter.java b/src/main/java/se/lantz/gamebase/GamebaseImporter.java
index 575fb0b..5712652 100644
--- a/src/main/java/se/lantz/gamebase/GamebaseImporter.java
+++ b/src/main/java/se/lantz/gamebase/GamebaseImporter.java
@@ -246,8 +246,16 @@ public class GamebaseImporter
     String coverFile = "";
     String coverSql = "SELECT Extras.Name, Extras.Path, Extras.DisplayOrder\r\n" +
       "FROM Games INNER JOIN Extras ON Games.GA_Id = Extras.GA_Id\r\n" + "WHERE (((Games.GA_Id)=" + gameId +
-      ") AND ((Extras.Name) Like \"Cover*\"));";
+      ") AND ((Extras.Name) Like ";
 
+    if (isC64)
+    {
+      coverSql = coverSql + "\"Cover*\"));";
+    }
+    else
+    {
+      coverSql = coverSql + "\"*Box Front\" OR (Extras.Name) Like \"*Inlay*\"));";
+    }
     ResultSet sqlResult = statement.executeQuery(coverSql);
     int displayOrder = -1;
     //Get the one with the lowest display order (probably the best one)