diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
index 5be13a225..94fafe137 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
@@ -53,7 +53,7 @@
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "&quot;/Users/thomasharte/Desktop/Soft/Master System/R-Type (NTSC).sms&quot;"
+            argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Soft/Master System/R-Type (NTSC).sms&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/Outputs/OpenGL/Primitives/Shader.cpp b/Outputs/OpenGL/Primitives/Shader.cpp
index 52e143f1e..d547fa623 100644
--- a/Outputs/OpenGL/Primitives/Shader.cpp
+++ b/Outputs/OpenGL/Primitives/Shader.cpp
@@ -14,8 +14,7 @@
 using namespace Outputs::Display::OpenGL;
 
 namespace {
-// The below is disabled because it isn't context-specific. Work to do.
-thread_local Shader *bound_shader = nullptr;
+thread_local const Shader *bound_shader = nullptr;
 Log::Logger<Log::Source::OpenGL> logger;
 }
 
@@ -107,20 +106,20 @@ void Shader::init(const std::string &vertex_shader, const std::string &fragment_
 }
 
 Shader::~Shader() {
-//	if(bound_shader == this) Shader::unbind();
+	if(bound_shader == this) Shader::unbind();
 	glDeleteProgram(shader_program_);
 }
 
 void Shader::bind() const {
-//	if(bound_shader != this) {
+	if(bound_shader != this) {
 		test_gl(glUseProgram, shader_program_);
-//		bound_shader = this;
-//	}
+		bound_shader = this;
+	}
 	flush_functions();
 }
 
 void Shader::unbind() {
-//	bound_shader = nullptr;
+	bound_shader = nullptr;
 	test_gl(glUseProgram, 0);
 }