diff --git a/src/gltk/program.d b/src/gltk/program.d
index 839497a..1147eb3 100644
--- a/src/gltk/program.d
+++ b/src/gltk/program.d
@@ -155,9 +155,9 @@ class Program(uniforms...)
     {
         static if ((i % 2) == 0)
         {
-            mixin("void set_" ~ v ~ "(" ~ uniform_param_decl_list(uniforms[i + 1]) ~ ")"
-                  "{"
-                  "    glUniform" ~ uniforms[i + 1] ~ "(m_uniform_" ~ v ~ ", " ~ uniform_param_list(uniforms[i + 1]) ~ ");"
+            mixin("void set_" ~ v ~ "(" ~ uniform_param_decl_list(uniforms[i + 1]) ~ ")" ~
+                  "{" ~
+                  "    glUniform" ~ uniforms[i + 1] ~ "(m_uniform_" ~ v ~ ", " ~ uniform_param_list(uniforms[i + 1]) ~ ");" ~
                   "}");
         }
     }
diff --git a/src/jes/gui/package.d b/src/jes/gui/package.d
index 47570e4..cad088a 100644
--- a/src/jes/gui/package.d
+++ b/src/jes/gui/package.d
@@ -8,7 +8,7 @@ class Gui
 {
     this()
     {
-        if (!jtk.init())
+        if (!jtk.initialize())
         {
             throw new Exception("JTK initialization failed.");
         }
diff --git a/src/jtk/init.d b/src/jtk/init.d
index 59c2e34..8e57bf1 100644
--- a/src/jtk/init.d
+++ b/src/jtk/init.d
@@ -9,7 +9,7 @@ import derelict.opengl;
 private extern(C) bool jtk_init();
 private extern(C) void jtk_quit();
 
-bool init()
+bool initialize()
 {
     DerelictGL3.load();
 
diff --git a/src/jtk/window.d b/src/jtk/window.d
index 6cb0766..eb189d5 100644
--- a/src/jtk/window.d
+++ b/src/jtk/window.d
@@ -2,6 +2,7 @@ module jtk.window;
 
 import std.string;
 import core.sync.mutex;
+import core.exception;
 
 import derelict.opengl;
 
@@ -71,7 +72,7 @@ class Window
         {
             return windows_by_id[window_id];
         }
-        catch (core.exception.RangeError re)
+        catch (RangeError re)
         {
             throw new Exception("Could not find requested JTK window ID");
         }