diff --git a/README b/README
index 2917c3a..1010342 100644
--- a/README
+++ b/README
@@ -317,8 +317,8 @@ python framework:
    output, and then reading any trailing characters as well formed json
    returning the test result.
 
-   This is a base clas and shouldn't be used directly, but provides an
-   explination of the bahvior of the following classes
+   This is a base class and should not be used directly, but provides an
+   explanation of the behavior of the following classes.
 
  PiglitGLTest
    A test class for native piglit OpenGL tests.
@@ -330,16 +330,16 @@ python framework:
  PiglitCLTest
    A test class for native piglit OpenCL tests.
 
-   It currently provides no specail features
+   It currently provides no special features.
 
  GLSLParserTest
    A class for testing a glsl parser.
 
-   It is generally unecissary to call this class directly as it uses a helper
-   function to search directories for tests
+   It is generally unnecessary to call this class directly as it uses a helper
+   function to search directories for tests.
 
  ShaderTest
-   A class for testing using OpenGL shaders
+   A class for testing using OpenGL shaders.
 
-   It is generally unecissary to call this class directly as it uses a helper
-   function to search directories for tests
+   It is generally unnecessary to call this class directly as it uses a helper
+   function to search directories for tests.
diff --git a/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c b/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c
index a2741aa..5b44f2f 100644
--- a/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c
+++ b/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c
@@ -233,7 +233,7 @@ create_prog(GLint sh1, GLint sh2)
 void
 piglit_init(int argc, char **argv)
 {
-	GLint vs, fs, gs, tes, tcs;
+	GLuint vs, fs, gs, tes, tcs;
 	GLuint pipe;
 	GLint prog_vs, prog_fs, prog_gs = 0, prog_tcs = 0, prog_tes = 0, prog_tess;
 	GLint prog_vs_fs, prog_vs_gs = 0;