diff --git a/src/driver/fade.cpp b/src/driver/fade.cpp
index 85a940e0c..1b96ec95a 100644
--- a/src/driver/fade.cpp
+++ b/src/driver/fade.cpp
@@ -89,8 +89,8 @@ void COSDFader::Stop()
 {
 	if ( fadeIn || fadeOut ) {
 		g_RCInput->killTimer(fadeTimer);
-		usleep(40000);
 #ifdef BOXMODEL_APOLLO
+		usleep(40000);
 		frameBuffer->setBlendMode(CNXTFB_BLEND_MODE_PER_PIXEL); // Global alpha multiplied with pixel alpha
 #else
 		frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index 24927fd98..073aed133 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -583,7 +583,7 @@ void CFrameBuffer::setBlendLevel(int level)
 
 	if (ioctl(fd, FBIO_SETOPACITY, value))
 		printf("FBIO_SETOPACITY failed.\n");
-#if 0
+#ifndef ISAPOLLO
 	   if(level == 100) // TODO: sucks.
 		   usleep(20000);
 #endif