diff --git a/src/main/java/kellerkinder/HomeFlix/application/Main.java b/src/main/java/kellerkinder/HomeFlix/application/Main.java
index e2acd3a..ae797af 100644
--- a/src/main/java/kellerkinder/HomeFlix/application/Main.java
+++ b/src/main/java/kellerkinder/HomeFlix/application/Main.java
@@ -93,7 +93,7 @@ public class Main extends Application {
 
 			
 			// get OS and the specific paths
-			if (osName.equals("Windows")) {
+			if (osName.contains("Windows")) {
 				directory = new File(dirWin);
 				configFile = new File(dirWin + "/config.xml");
 				posterCache = new File(dirWin + "/posterCache");
diff --git a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java
index 36fd8fc..7ca7306 100644
--- a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java
+++ b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java
@@ -333,7 +333,7 @@ public class DBController {
 									if (!filmsdbStreamURL.contains(episode.getPath())) {
 										LOGGER.info("Added \"" + file.getName() + "\", Episode: " + episode.getName() + " to database");
 										stmt.executeUpdate("insert into films values ("
-										+ "'" + episode.getPath() + "',"
+										+ "'" + episode.getPath().replace("'", "''") + "',"
 										+ "'" + cutOffEnd(file.getName()) + "','" + sn + "','" + ep + "', 0, 0)");
 										connection.commit();
 										stmt.close();