diff --git a/ps3/rgl/src/ps3/include/rgl-inline.h b/ps3/rgl/src/ps3/include/rgl-inline.h
index b493799a5d..091396977a 100644
--- a/ps3/rgl/src/ps3/include/rgl-inline.h
+++ b/ps3/rgl/src/ps3/include/rgl-inline.h
@@ -74,10 +74,10 @@ static inline GLuint rglPlatformGetBitsPerPixel (GLenum internalFormat)
  (thisContext->current) += 2;
 
 #define rglGcmSetWaitLabel(thisContext, index, value) \
- (thisContext->current)[0] = (((1) << (18)) | ((0x00000064))); \
+ (thisContext->current)[0] = (((1) << (18)) | ((CELL_GCM_NV406E_SEMAPHORE_OFFSET))); \
  (thisContext->current)[1] = 0x10 * index; \
  (thisContext->current) += 2; \
- (thisContext->current)[0] = (((1) << (18)) | ((0x00000068))); \
+ (thisContext->current)[0] = (((1) << (18)) | ((CELL_GCM_NV406E_SEMAPHORE_ACQUIRE))); \
  (thisContext->current)[1] = (value); \
  (thisContext->current) += 2;
 
@@ -298,6 +298,19 @@ static inline GLuint rglPlatformGetBitsPerPixel (GLenum internalFormat)
    rglGcmTransferData( dstId, dstOffset, size, id, 0, size, size, 1 ); \
    gmmFree( id )
 
+#define rglGcmSetUpdateFragmentProgramParameter(thisContext, offset, location) \
+ (thisContext->current)[0] = (((1) << (18)) | ((CELL_GCM_NV4097_SET_SHADER_PROGRAM))); \
+ (thisContext->current)[1] = ((location+1) | (offset)); \
+ (thisContext->current) += 2
+
+#define rglGcmSetBlendColor(thisContext, color, color2) \
+ (thisContext->current)[0] = (((1) << (18)) | ((CELL_GCM_NV4097_SET_BLEND_COLOR))); \
+ (thisContext->current)[1] = (color); \
+ (thisContext->current) += 2; \
+ (thisContext->current)[0] = (((1) << (18)) | ((CELL_GCM_NV4097_SET_BLEND_COLOR2))); \
+ (thisContext->current)[1] = (color2); \
+ (thisContext->current) += 2
+
 static inline void rglGcmSetFragmentProgramLoad(struct CellGcmContextData *thisContext, const CellCgbFragmentProgramConfiguration *conf, const uint32_t location)
 {
    uint32_t rawData = ((conf->offset)&0x1fffffff);
@@ -360,13 +373,14 @@ static void rglGcmSetDrawArraysSlow(struct CellGcmContextData *thisContext, uint
    count >>= 8;
 
    uint32_t loop, rest;
-   loop = count / (2047);
-   rest = count % (2047);
+   loop = count / CELL_GCM_MAX_METHOD_COUNT;
+   rest = count % CELL_GCM_MAX_METHOD_COUNT;
 
    (thisContext->current)[0] = (((3) << (18)) | CELL_GCM_NV4097_INVALIDATE_VERTEX_FILE | (0x40000000));
    (thisContext->current)[1] = 0;
    (thisContext->current)[2] = 0;
-   (thisContext->current)[3] = 0; ; (thisContext->current) += 4;
+   (thisContext->current)[3] = 0;
+   (thisContext->current) += 4;
 
    (thisContext->current)[0] = (((1) << (18)) | CELL_GCM_NV4097_SET_BEGIN_END);
    (thisContext->current)[1] = ((mode));
diff --git a/ps3/rgl/src/ps3/rgl_ps3.cpp b/ps3/rgl/src/ps3/rgl_ps3.cpp
index 36a43b620d..07229a1343 100644
--- a/ps3/rgl/src/ps3/rgl_ps3.cpp
+++ b/ps3/rgl/src/ps3/rgl_ps3.cpp
@@ -1589,7 +1589,7 @@ GLboolean rglGcmInitFromRM( rglGcmResource *rmResource )
    // Set the GPU to a known state
 
    // initialize the default OpenGL state
-   GCM_FUNC( cellGcmSetBlendColor, 0, 0);
+   rglGcmSetBlendColor(gCellGcmCurrentContext, 0, 0);
    GCM_FUNC( cellGcmSetBlendEquation, RGLGCM_FUNC_ADD, RGLGCM_FUNC_ADD );
    GCM_FUNC( cellGcmSetBlendFunc, RGLGCM_ONE, RGLGCM_ZERO, RGLGCM_ONE, RGLGCM_ZERO );
    rglGcmSetClearColor(thisContext, 0 );
diff --git a/ps3/rgl/src/ps3/rgl_ps3_raster.cpp b/ps3/rgl/src/ps3/rgl_ps3_raster.cpp
index 73fe129e88..53f1f21248 100644
--- a/ps3/rgl/src/ps3/rgl_ps3_raster.cpp
+++ b/ps3/rgl/src/ps3/rgl_ps3_raster.cpp
@@ -1680,7 +1680,7 @@ GLAPI void APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count)
             if (rglGcmState_i.renderTarget.colorFormat == RGLGCM_ARGB8)
             {
                RGLGCM_CALC_COLOR_LE_ARGB8( &hwColor, blend->r, blend->g, blend->b, blend->a );
-               GCM_FUNC( cellGcmSetBlendColor, hwColor, hwColor );
+               rglGcmSetBlendColor(gCellGcmCurrentContext, hwColor, hwColor);
             }
 
             GCM_FUNC( cellGcmSetBlendEquation, (rglGcmEnum)LContext->BlendEquationRGB,
@@ -1851,8 +1851,9 @@ beginning:
       rglGcmSetInvalidateVertexCache(thisContext);
    }
 
-   GCM_FUNC( cellGcmSetUpdateFragmentProgramParameter, 
-         gmmIdToOffset( driver->fpLoadProgramId ) + driver->fpLoadProgramOffset );
+   rglGcmSetUpdateFragmentProgramParameter(gCellGcmCurrentContext,
+         gmmIdToOffset( driver->fpLoadProgramId ) + driver->fpLoadProgramOffset,
+         CELL_GCM_LOCATION_LOCAL);
 
    uint8_t gcmMode = 0;
 
@@ -2695,7 +2696,7 @@ void rglGcmFifoGlSetRenderTarget (const void *data)
       if (rglGcmState_i.renderTarget.colorFormat == RGLGCM_ARGB8)
       {
          RGLGCM_CALC_COLOR_LE_ARGB8( &hwColor, blend->r, blend->g, blend->b, blend->a );
-         GCM_FUNC( cellGcmSetBlendColor, hwColor, hwColor );
+         rglGcmSetBlendColor(gCellGcmCurrentContext, hwColor, hwColor);
       }
    }