diff --git a/src/graphics/graphics.c b/src/graphics/graphics.c
index adcc901e..32455bf9 100644
--- a/src/graphics/graphics.c
+++ b/src/graphics/graphics.c
@@ -215,12 +215,6 @@ void lovrGraphicsCreateWindow(int w, int h, bool fullscreen, int msaa, const cha
   } else {
     glDisable(GL_FRAMEBUFFER_SRGB);
   }
-#else
-  if (state.gammaCorrect) {
-    glEnable(GL_FRAMEBUFFER_SRGB_EXT);
-  } else {
-    glDisable(GL_FRAMEBUFFER_SRGB_EXT);
-  }
 #endif
   glEnable(GL_BLEND);
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
diff --git a/src/graphics/shader.c b/src/graphics/shader.c
index ccdb523d..3b02e42b 100644
--- a/src/graphics/shader.c
+++ b/src/graphics/shader.c
@@ -146,6 +146,10 @@ Shader* lovrShaderCreate(const char* vertexSource, const char* fragmentSource) {
   float defaultVertexColor[4] = { 1., 1., 1., 1. };
   glVertexAttrib4fv(LOVR_SHADER_VERTEX_COLOR, defaultVertexColor);
 
+  // Set default bone ids
+  int defaultBones[4] = { 0., 0., 0., 0. };
+  glVertexAttribI4iv(LOVR_SHADER_BONES, defaultBones);
+
   // Set default bone weights
   float defaultBoneWeights[4] = { 1., 0., 0., 0. };
   glVertexAttrib4fv(LOVR_SHADER_BONE_WEIGHTS, defaultBoneWeights);