diff --git a/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java b/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
index 5b6a71da..8c65318f 100644
--- a/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
+++ b/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
@@ -27,7 +27,7 @@ public class MainActivity extends AndroidApplication {
 
         // set our globals
         CanvasAdapter.g = AndroidGraphics.INSTANCE;
-        GLAdapter.INSTANCE = new AndroidGLAdapter();
+        GLAdapter.g = new AndroidGLAdapter();
 		Log.logger = new AndroidLog();
 		// TODO make this dpi dependent
 		Tile.SIZE = 400;
diff --git a/vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java b/vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java
index 9eb41cf3..3f7e405a 100644
--- a/vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java
+++ b/vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java
@@ -7,7 +7,6 @@ import java.nio.IntBuffer;
 
 import javax.imageio.ImageIO;
 
-import org.oscim.backend.Log;
 import org.oscim.backend.canvas.Bitmap;
 
 import com.badlogic.gdx.Gdx;
diff --git a/vtm-gdx-desktop/src/org/oscim/awt/AwtGraphics.java b/vtm-gdx-desktop/src/org/oscim/awt/AwtGraphics.java
index a2cec837..2434d3ec 100644
--- a/vtm-gdx-desktop/src/org/oscim/awt/AwtGraphics.java
+++ b/vtm-gdx-desktop/src/org/oscim/awt/AwtGraphics.java
@@ -10,6 +10,7 @@ import java.io.InputStream;
 
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Canvas;
+import org.oscim.backend.BitmapUtils;
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Paint;
 
@@ -86,5 +87,13 @@ public class AwtGraphics extends CanvasAdapter {
         }
 	}
 
-
+	@Override
+	public Bitmap loadBitmapAsset(String fileName) {
+		try {
+			return BitmapUtils.createBitmap(fileName);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
 }
diff --git a/vtm-gdx-desktop/src/org/oscim/awt/AwtPaint.java b/vtm-gdx-desktop/src/org/oscim/awt/AwtPaint.java
index 4705c394..868e0611 100644
--- a/vtm-gdx-desktop/src/org/oscim/awt/AwtPaint.java
+++ b/vtm-gdx-desktop/src/org/oscim/awt/AwtPaint.java
@@ -66,26 +66,21 @@ public class AwtPaint implements Paint {
 
 	@Override
 	public int getColor() {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
 	public int getTextHeight(String text) {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
 	public int getTextWidth(String text) {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
 	public void setBitmapShader(Bitmap bitmap) {
-		// TODO Auto-generated method stub
-
 	}
 
 	@Override
diff --git a/vtm-gdx-desktop/src/org/oscim/gdx/Main.java b/vtm-gdx-desktop/src/org/oscim/gdx/Main.java
index 9f05ca77..73095047 100644
--- a/vtm-gdx-desktop/src/org/oscim/gdx/Main.java
+++ b/vtm-gdx-desktop/src/org/oscim/gdx/Main.java
@@ -23,7 +23,7 @@ public class Main {
 
 		// set our globals
         CanvasAdapter.g = AwtGraphics.INSTANCE;
-        GLAdapter.INSTANCE = new GdxGLAdapter();
+        GLAdapter.g = new GdxGLAdapter();
 		Tile.SIZE = 256;
 
         new SharedLibraryLoader().load("vtm-jni");