diff --git a/application/driveruipanels.cpp b/application/driveruipanels.cpp
index cccd77e6..18175193 100644
--- a/application/driveruipanels.cpp
+++ b/application/driveruipanels.cpp
@@ -1046,9 +1046,9 @@ debug_panel::update_section_engine( std::vector<text_line> &Output ) const {
 		for( int i = 0; i <= 20; ++i ) {
 
 			std::string parameters =
-			    mover.eimc_labels[ i ] + to_string( mover.eimc[ i ], 2, 9 )
+			    TMoverParameters::eimc_labels[ i ] + to_string( mover.eimc[ i ], 2, 9 )
 			    + " | "
-			    + mover.eimv_labels[ i ] + to_string( mover.eimv[ i ], 2, 9 );
+			    + TMoverParameters::eimv_labels[ i ] + to_string( mover.eimv[ i ], 2, 9 );
 
 			if( i < 10 ) {
 				parameters +=
@@ -1058,7 +1058,7 @@ debug_panel::update_section_engine( std::vector<text_line> &Output ) const {
 				parameters += "        med:";
 			}
 			else if( i >= 13 ) {
-				parameters += " | " + vehicle.MED_labels[ i - 13 ] + to_string( vehicle.MED[ 0 ][ i - 13 ], 2, 9 );
+				parameters += " | " + TDynamicObject::MED_labels[ i - 13 ] + to_string( vehicle.MED[ 0 ][ i - 13 ], 2, 9 );
 			}
 
             Output.emplace_back( parameters, Global.UITextColor );
diff --git a/gl/shader.cpp b/gl/shader.cpp
index c53268b2..ad9f72c5 100644
--- a/gl/shader.cpp
+++ b/gl/shader.cpp
@@ -73,11 +73,11 @@ void gl::shader::expand_includes(std::string &str, const std::string &basedir)
     size_t start_pos = 0;
 
     std::string magic = "#include";
-    while ((start_pos = str.find(magic, start_pos)) != str.npos)
+    while ((start_pos = str.find(magic, start_pos)) != std::string::npos)
     {
         size_t fp = str.find('<', start_pos);
         size_t fe = str.find('>', start_pos);
-        if (fp == str.npos || fe == str.npos)
+        if (fp == std::string::npos || fe == std::string::npos)
             return;
 
         std::string filename = str.substr(fp + 1, fe - fp - 1);
@@ -188,11 +188,11 @@ void gl::shader::parse_texture_entries(std::string &str)
     size_t start_pos = 0;
 
     std::string magic = "#texture";
-    while ((start_pos = str.find(magic, start_pos)) != str.npos)
+    while ((start_pos = str.find(magic, start_pos)) != std::string::npos)
     {
         size_t fp = str.find('(', start_pos);
         size_t fe = str.find(')', start_pos);
-        if (fp == str.npos || fe == str.npos)
+        if (fp == std::string::npos || fe == std::string::npos)
             return;
 
         std::istringstream ss(str.substr(fp + 1, fe - fp - 1));
@@ -242,11 +242,11 @@ void gl::shader::parse_param_entries(std::string &str)
     size_t start_pos = 0;
 
     std::string magic = "#param";
-    while ((start_pos = str.find(magic, start_pos)) != str.npos)
+    while ((start_pos = str.find(magic, start_pos)) != std::string::npos)
     {
         size_t fp = str.find('(', start_pos);
         size_t fe = str.find(')', start_pos);
-        if (fp == str.npos || fe == str.npos)
+        if (fp == std::string::npos || fe == std::string::npos)
             return;
 
         std::istringstream ss(str.substr(fp + 1, fe - fp - 1));
diff --git a/rendering/opengl33particles.cpp b/rendering/opengl33particles.cpp
index 002bf101..8ff82b95 100644
--- a/rendering/opengl33particles.cpp
+++ b/rendering/opengl33particles.cpp
@@ -113,8 +113,8 @@ opengl33_particles::render() {
 		m_vao->setup_attrib(*m_buffer, 1, 4, GL_FLOAT, sizeof(particle_vertex), 12);
 		m_vao->setup_attrib(*m_buffer, 2, 2, GL_FLOAT, sizeof(particle_vertex), 28);
 
-		m_buffer->unbind(gl::buffer::ARRAY_BUFFER);
-		m_vao->unbind();
+		gl::buffer::unbind(gl::buffer::ARRAY_BUFFER);
+		gl::vao::unbind();
 	}
 
 	if (!m_shader) {
@@ -130,9 +130,9 @@ opengl33_particles::render() {
 
 	glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(m_particlevertices.size()));
 
-	m_shader->unbind();
-	m_vao->unbind();
-	m_buffer->unbind(gl::buffer::ARRAY_BUFFER);
+	gl::program::unbind();
+	gl::vao::unbind();
+	gl::buffer::unbind(gl::buffer::ARRAY_BUFFER);
 
     return m_particlevertices.size() / 6;
 }
diff --git a/rendering/opengl33precipitation.cpp b/rendering/opengl33precipitation.cpp
index e31eb25f..be08bf50 100644
--- a/rendering/opengl33precipitation.cpp
+++ b/rendering/opengl33precipitation.cpp
@@ -121,7 +121,7 @@ opengl33_precipitation::update() {
 		m_indexbuffer->upload(gl::buffer::ELEMENT_ARRAY_BUFFER, m_indices.data(), 0, m_indices.size() * sizeof( unsigned short ));
 		m_vao->setup_ebo(*m_indexbuffer);
 
-		m_vao->unbind();
+		gl::vao::unbind();
         // NOTE: vertex and index source data is superfluous past this point, but, eh
     }
 
@@ -155,5 +155,5 @@ opengl33_precipitation::render() {
 
     ::glDrawElements( GL_TRIANGLES, static_cast<GLsizei>( m_indices.size() ), GL_UNSIGNED_SHORT, reinterpret_cast<void const*>( 0 ) );
 
-    m_vao->unbind();
+    gl::vao::unbind();
 }
diff --git a/rendering/opengl33skydome.cpp b/rendering/opengl33skydome.cpp
index 072c3f32..cbceeed4 100644
--- a/rendering/opengl33skydome.cpp
+++ b/rendering/opengl33skydome.cpp
@@ -44,7 +44,7 @@ void opengl33_skydome::update() {
 		m_indexbuffer->upload(gl::buffer::ELEMENT_ARRAY_BUFFER, skydome.indices().data(), 0, skydome.indices().size() * sizeof( unsigned short ));
 		m_vao->setup_ebo(*m_indexbuffer);
 
-		m_vao->unbind();
+		gl::vao::unbind();
     }
     // ship the current dynamic data to the gpu
     if (true == skydome.is_dirty() && m_coloursbuffer) {