diff --git a/src/main/c/compile.sh b/src/main/c/compile.sh
index e019d55..250abd8 100644
--- a/src/main/c/compile.sh
+++ b/src/main/c/compile.sh
@@ -58,12 +58,12 @@ rm -f ./*.dll
 # OUTPUT_FILE="./chunkmask.o"
 # gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
 
-COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow"
+COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -DSAVE_STEPS=$SAVE_STEPS"
 INPUT_FILES="./src/javainterface.c"
 OUTPUT_FILE="./javainterface.o"
 gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
 
-COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow -DSAVE_STEPS=$SAVE_STEPS"
+COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -DSAVE_STEPS=$SAVE_STEPS"
 INPUT_FILES="./src/fluidsim.c"
 OUTPUT_FILE="./fluidsim.o"
 gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
diff --git a/src/main/java/electrosphere/FluidSim.java b/src/main/java/electrosphere/FluidSim.java
index c744503..168dde9 100644
--- a/src/main/java/electrosphere/FluidSim.java
+++ b/src/main/java/electrosphere/FluidSim.java
@@ -28,10 +28,11 @@ public class FluidSim {
      * Load fluid sim library
      */
     static {
-        String osName = System.getProperty("os.name");
+        String osName = System.getProperty("os.name").toLowerCase();
+        System.out.println(osName);
         if(osName.contains("win")){
             System.load(new File("./shared-folder/libfluidsim.dll").toPath().toAbsolutePath().toString());
-        } else if(osName.contains("nix")){
+        } else {
             System.load(new File("./shared-folder/libfluidsim.so").toPath().toAbsolutePath().toString());
         }
     }