diff --git a/recipes/gears/gears.c b/recipes/gears/gears.c
index 75873edeb..4f0e03872 100644
--- a/recipes/gears/gears.c
+++ b/recipes/gears/gears.c
@@ -285,7 +285,7 @@ main(int argc, char *argv[])
     limit = 0;
   }
 
-  OSMesaContext ctx = OSMesaCreateContextExt(OSMESA_RGBA, 16, 0, 0, NULL);
+  OSMesaContext ctx = OSMesaCreateContextExt(OSMESA_BGRA, 16, 0, 0, NULL);
   if (!ctx) {
     printf("OSMesaCreateContextExt failed\n");
     return 1;
diff --git a/recipes/gears/recipe.sh b/recipes/gears/recipe.sh
index e9756dc75..6d0a6e133 100644
--- a/recipes/gears/recipe.sh
+++ b/recipes/gears/recipe.sh
@@ -11,6 +11,7 @@ function recipe_update {
 }
 
 function recipe_prepare {
+    rm -rf source
     mkdir source
     cp gears.c source
 }
diff --git a/recipes/osdemo/osdemo.c b/recipes/osdemo/osdemo.c
index 9b0b4c9bf..ae4bfa2ad 100644
--- a/recipes/osdemo/osdemo.c
+++ b/recipes/osdemo/osdemo.c
@@ -415,7 +415,7 @@ test(GLenum type, GLint bits, const char *filename)
           type == GL_UNSIGNED_SHORT ||
           type == GL_FLOAT);
 
-   ctx = OSMesaCreateContextExt(OSMESA_RGBA, z, stencil, accum, NULL );
+   ctx = OSMesaCreateContextExt(OSMESA_BGRA, z, stencil, accum, NULL );
    if (!ctx) {
       printf("OSMesaCreateContextExt() failed!\n");
       return 0;
diff --git a/recipes/osdemo/recipe.sh b/recipes/osdemo/recipe.sh
index 8e046a72e..9c8662b40 100644
--- a/recipes/osdemo/recipe.sh
+++ b/recipes/osdemo/recipe.sh
@@ -11,6 +11,7 @@ function recipe_update {
 }
 
 function recipe_prepare {
+    rm -rf source
     mkdir source
     cp osdemo.c source
 }