diff --git a/cockatrice/src/gameview.cpp b/cockatrice/src/gameview.cpp
index 47d2090b..b7f8de80 100644
--- a/cockatrice/src/gameview.cpp
+++ b/cockatrice/src/gameview.cpp
@@ -7,6 +7,7 @@ GameView::GameView(QGraphicsScene *scene, QWidget *parent)
 	setBackgroundBrush(QBrush(QColor(0, 0, 0)));
 	setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing/* | QPainter::SmoothPixmapTransform*/);
 	setDragMode(RubberBandDrag);
+	setFocusPolicy(Qt::NoFocus);
 	setViewportUpdateMode(BoundingRectViewportUpdate);
 
 	connect(scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(updateSceneRect(const QRectF &)));
diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp
index accd1b00..9fec0356 100644
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/messagelogwidget.cpp
@@ -298,27 +298,6 @@ void MessageLogWidget::connectToPlayer(Player *player)
 	connect(player, SIGNAL(logDumpZone(Player *, CardZone *, int)), this, SLOT(logDumpZone(Player *, CardZone *, int)));
 	connect(player, SIGNAL(logStopDumpZone(Player *, CardZone *)), this, SLOT(logStopDumpZone(Player *, CardZone *)));
 	connect(player, SIGNAL(logDrawCards(Player *, int)), this, SLOT(logDrawCards(Player *, int)));
-/*
-	connect(game, SIGNAL(logJoin(Player *)), this, SLOT(logJoin(Player *)));
-	connect(game, SIGNAL(logLeave(Player *)), this, SLOT(logLeave(Player *)));
-	connect(game, SIGNAL(logGameClosed()), this, SLOT(logGameClosed()));
-	connect(game, SIGNAL(logJoinSpectator(QString)), this, SLOT(logJoinSpectator(QString)));
-	connect(game, SIGNAL(logLeaveSpectator(QString)), this, SLOT(logLeaveSpectator(QString)));
-	
-	//Alert Test
-	connect(game, SIGNAL(logSay(Player *, QString)), this, SLOT(msgAlert()));
-	connect(game, SIGNAL(logJoin(Player *)), this, SLOT(msgAlert()));
-	connect(game, SIGNAL(logLeave(Player *)), this, SLOT(msgAlert()));
-	connect(game, SIGNAL(logSetActivePlayer(Player *)), this, SLOT(msgAlert()));
-	connect(game, SIGNAL(setActivePhase(int)), this, SLOT(msgAlert()));
-	connect(game, SIGNAL(logDraw(Player *, int)), this, SLOT(msgAlert()));
-	connect(game, SIGNAL(logMoveCard(Player *, QString, CardZone *, int, CardZone *, int)), this, SLOT(msgAlert()));
-	connect(game, SIGNAL(logGameStart()), this, SLOT(msgAlert()));
-*/}
-
-void MessageLogWidget::msgAlert()
-{
-	QApplication::alert(this);
 }
 
 MessageLogWidget::MessageLogWidget(QWidget *parent)
diff --git a/cockatrice/src/messagelogwidget.h b/cockatrice/src/messagelogwidget.h
index 72ff7fc8..61af628b 100644
--- a/cockatrice/src/messagelogwidget.h
+++ b/cockatrice/src/messagelogwidget.h
@@ -47,7 +47,6 @@ public slots:
 	void logStopDumpZone(Player *player, CardZone *zone);
 	void logSetActivePlayer(Player *player);
 	void logSetActivePhase(int phase);
-	void msgAlert();
 public:
 	void connectToPlayer(Player *player);
 	MessageLogWidget(QWidget *parent = 0);
diff --git a/cockatrice/src/phasestoolbar.cpp b/cockatrice/src/phasestoolbar.cpp
index 9cc24b8d..c0cbf6f7 100644
--- a/cockatrice/src/phasestoolbar.cpp
+++ b/cockatrice/src/phasestoolbar.cpp
@@ -8,6 +8,7 @@
 PhaseButton::PhaseButton(const QIcon &icon, QAction *_doubleClickAction)
 	: QPushButton(icon, QString()), active(false), doubleClickAction(_doubleClickAction), activePixmap(50, 50), inactivePixmap(50, 50)
 {
+	setFocusPolicy(Qt::NoFocus);
 	setFixedSize(50, 50);
 	
 	updatePixmap(activePixmap, true);
@@ -79,6 +80,7 @@ PhasesToolbar::PhasesToolbar(QWidget *parent)
 		connect(buttonList[i], SIGNAL(clicked()), this, SLOT(phaseButtonClicked()));
 	
 	QPushButton *nextTurnButton = new QPushButton(QIcon(":/resources/icon_nextturn.svg"), QString());
+	nextTurnButton->setFocusPolicy(Qt::NoFocus);
 	nextTurnButton->setIconSize(QSize(40, 40));
 	nextTurnButton->setFixedSize(50, 50);
 	connect(nextTurnButton, SIGNAL(clicked()), this, SLOT(actNextTurn()));