diff --git a/src/i810_accel.c b/src/i810_accel.c
index 2b0b594a..9a90e50d 100644
--- a/src/i810_accel.c
+++ b/src/i810_accel.c
@@ -259,7 +259,7 @@ I810Sync(ScrnInfoPtr pScrn)
 #ifdef XF86DRI
    /* VT switching tries to do this.  
     */
-   if (!pI810->LockHeld && pI810->directRenderingEnabled) {
+   if ((!pI810->LockHeld && pI810->directRenderingEnabled) || pScrn->vtSema) {
       return;
    }
 #endif
diff --git a/src/i810_driver.c b/src/i810_driver.c
index ca69f3b6..153ed552 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -905,10 +905,13 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
     *  Changed to 8 Meg so we can have acceleration by default (Mark).
     */
    mem = I810CheckAvailableMemory(pScrn);
-   if (pI810->directRenderingDisabled || mem < 134217728)  /* < 128 MB */
+   if (pI810->directRenderingDisabled || mem < 131072)  /* < 128 MB */
        pScrn->videoRam = 8192;
+   else if (mem < 196608)
+       pScrn->videoRam = 16384;  /* < 192 MB */
    else
-       pScrn->videoRam = 16384;
+       pScrn->videoRam = 24576;
+   
    from = X_DEFAULT;
    
    if (pI810->pEnt->device->videoRam) {