diff --git a/BuildTables/main.c b/BuildTables/main.c
index 151f4dd..77558ac 100644
--- a/BuildTables/main.c
+++ b/BuildTables/main.c
@@ -64,7 +64,7 @@ int main(void) {
 		"#ifndef H_J3DTBLS_\n"
 		"#define H_J3DTBLS_\n\n"
 		"#include \"j3d.h\"\n\n"
-		"nstatic jreal sinTable[] = {\n\t"
+		"static jreal sinTable[] = {\n\t"
 	);
 
 	// Build look-up tables for speed later
diff --git a/j3d/j3d.c b/j3d/j3d.c
index 939f691..3c58d68 100644
--- a/j3d/j3d.c
+++ b/j3d/j3d.c
@@ -173,7 +173,7 @@ void j3DrawTriangle2D(jint16 x1, jint16 y1, jint16 x2,jint16 y2, jint16 x3, jint
 		return;
 	}
 
-	jlDrawColor((byte)color);
+	jlDrawColorSet((byte)color);
 
 	// Is top of triangle flat?
 	if (y1 == y2) {
diff --git a/j3d/j3dtbls.h b/j3d/j3dtbls.h
index 696e065..b9ecbf9 100644
--- a/j3d/j3dtbls.h
+++ b/j3d/j3dtbls.h
@@ -25,7 +25,7 @@
 
 #include "j3d.h"
 
-nstatic jreal sinTable[] = {
+static jreal sinTable[] = {
 	 0.0000000,  0.0174524,  0.0348995,  0.0523360,  0.0697565,  0.0871557, 
 	 0.1045285,  0.1218693,  0.1391731,  0.1564345,  0.1736482,  0.1908090, 
 	 0.2079117,  0.2249510,  0.2419219,  0.2588190,  0.2756374,  0.2923717, 
diff --git a/j3d/main.c b/j3d/main.c
index 4935b3a..cba9003 100644
--- a/j3d/main.c
+++ b/j3d/main.c
@@ -52,7 +52,7 @@ void printAt(jlStaT *font, jint16 cx, jint16 cy, const char *what, ...) {
 		for (counter=0; counter<(int)strlen(msg); counter++) {
 			x = msg[counter] % 40;
 			y = msg[counter] / 40;
-			jlDrawBlit8x8(font, x, y, counter + cx, cy);
+			jlDrawBlit8x8(jlStaSurfaceGet(font), x, y, counter + cx, cy);
 		}
 }
 
@@ -128,9 +128,9 @@ int main(void) {
 		}
 
 		while (!jlKeyPressed() && !jlUtilMustExit()) {
-			jlDrawColor(0);
+			jlDrawColorSet(0);
 			jlDrawClear();
-			jlDrawColor(15);
+			jlDrawColorSet(15);
 			jlDrawBox(0, 0, 319, 199);
 
 			for (x=0; x<world->objectCount; x++) {