diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 6548ea3b..31e0160a 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -123,8 +123,6 @@ UBBoardView::init ()
   setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
   setAcceptDrops (true);
 
-  setOptimizationFlag (QGraphicsView::IndirectPainting); // enable UBBoardView::drawItems filter
-
   mTabletStylusIsPressed = false;
   mMouseButtonIsPressed = false;
   mPendingStylusReleaseEvent = false;
@@ -426,7 +424,7 @@ bool UBBoardView::itemShouldReceiveMousePressEvent(QGraphicsItem *item)
     UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController()->stylusTool();
 
     if ((currentTool == UBStylusTool::Play) && UBGraphicsGroupContainerItem::Type == movingItem->type())
-        return movingItem = NULL;
+        return movingItem == NULL;
 
     switch(item->type())
     {
@@ -536,7 +534,7 @@ bool UBBoardView::itemShouldBeMoved(QGraphicsItem *item)
         return !item->isSelected();
 
     default: 
-        false;
+        return false;
     }
 
     return false;