diff --git a/.travis.yml b/.travis.yml
index 4b0e919..26f51f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,9 @@
 language: java
 
+dist: trusty
+
 jdk:
-  - oraclejdk7
+  - openjdk7
   - oraclejdk8
 
 before_install:
@@ -65,4 +67,4 @@ deploy:
       repo: Parabot/Parabot
       branch:
         - master
-      jdk: 'oraclejdk7'
\ No newline at end of file
+      jdk: 'openjdk7'
\ No newline at end of file
diff --git a/src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java b/src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java
index 0c60ec3..22dda99 100644
--- a/src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java
+++ b/src/main/java/org/parabot/core/asm/redirect/ThreadRedirect.java
@@ -24,7 +24,7 @@ public class ThreadRedirect {
 	}
 
 	public static Thread currentThread(){
-		return null;
+		return new Thread();
 	}
 
 	public static void join(Thread t) throws InterruptedException{
diff --git a/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java b/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java
index 1bafabc..bb01d54 100644
--- a/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java
+++ b/src/main/java/org/parabot/core/asm/redirect/ToolkitRedirect.java
@@ -40,11 +40,11 @@ public class ToolkitRedirect {
 	}
 
 	public static Image createImage(Toolkit t,byte[] b){
-		return null;
+		return t.createImage(b);
 	}
 
 	public static Image createImage(Toolkit t, String s){
-		return null;
+		return t.createImage(s);
 	}
 	
 	public static Image getImage(Toolkit t,URL u){