diff --git a/build.sh b/build.sh
index eb33a38..047970d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,6 @@
-mkdir ./out
+[ -d ./out ] || mkdir ./out
 find -name "*.java" > sources.txt
-BUILD_COMMAND="javac -d ./out @sources.txt"
-${BUILD_COMMAND} --add-exports=java.desktop/sun.awt=ALL-UNNAMED || \
-  echo "Command failed, retrying assuming older Java build" && ${BUILD_COMMAND}
+javac -d ./out @sources.txt
 cd ./out
 find ../src -name "*.png" -exec cp '{}' ./com/modsim/res/ \;
 jar cfm ../ModuleSim-Test.jar ../src/META-INF/MANIFEST.MF ./
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
index fbda7f5..acd89d2 100644
--- a/src/META-INF/MANIFEST.MF
+++ b/src/META-INF/MANIFEST.MF
@@ -1,3 +1,2 @@
 Manifest-Version: 1.0
 Main-Class: com.modsim.Main
-Add-Exports: java.desktop/sun.awt
diff --git a/src/com/modsim/simulator/Sim.java b/src/com/modsim/simulator/Sim.java
index 11eb01b..5a1fbbf 100644
--- a/src/com/modsim/simulator/Sim.java
+++ b/src/com/modsim/simulator/Sim.java
@@ -12,7 +12,6 @@
 import com.modsim.modules.*;
 import static com.modsim.modules.BaseModule.AvailableModules;
 import com.modsim.modules.parts.Port;
-import sun.awt.Mutex;
 
 import com.modsim.util.BinData;
 import com.modsim.util.CtrlPt;
@@ -20,7 +19,7 @@
 public class Sim implements Runnable {
 
     private Thread thread;
-    public final Mutex lock = new Mutex();
+    public final Object lock = new Object();
 
     private int lastLinkInd = 0;
 
diff --git a/src/com/modsim/util/ModuleClipboard.java b/src/com/modsim/util/ModuleClipboard.java
index 4017e72..ce47ec1 100644
--- a/src/com/modsim/util/ModuleClipboard.java
+++ b/src/com/modsim/util/ModuleClipboard.java
@@ -185,6 +185,7 @@ public String getClipboardContents() {
         
         if (hasTransferableFiles) {
             try {
+                @SuppressWarnings("unchecked")
                 List<File> files = (List<File>) contents.getTransferData(DataFlavor.javaFileListFlavor);
                 if (files.size() == 1) {
                     File file = files.get(0);