diff --git a/cockatrice/src/carddatabase.h b/cockatrice/src/carddatabase.h
index 28c33b39..907d4490 100644
--- a/cockatrice/src/carddatabase.h
+++ b/cockatrice/src/carddatabase.h
@@ -34,7 +34,6 @@ public:
 
 class CardInfo {
 private:
-	class SetCompareFunctor;
 	CardDatabase *db;
 
 	QString name;
diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp
index 9ebf0306..31788059 100644
--- a/cockatrice/src/carditem.cpp
+++ b/cockatrice/src/carditem.cpp
@@ -189,12 +189,13 @@ void CardItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 	if (!zone->getPlayer()->getLocal())
 		return;
 
-	if (zone->getName() == "hand") {
+	if (zone->getName() == "table")
+		((TableZone *) zone)->toggleTapped();
+	else {
 		TableZone *table = (TableZone *) zone->getPlayer()->getZones()->findZone("table");
 		QPoint gridPoint = table->getFreeGridPoint(info->getTableRow());
 		table->handleDropEvent(id, zone, table->mapFromGrid(gridPoint).toPoint(), false);
-	} else if (zone->getName() == "table")
-		((TableZone *) zone)->toggleTapped();
+	}
 }
 
 void CardItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
@@ -203,11 +204,6 @@ void CardItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 	QGraphicsItem::hoverEnterEvent(event);
 }
 
-void CardItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
-{
-	QGraphicsItem::hoverLeaveEvent(event);
-}
-
 QVariant CardItem::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
 {
 	if (change == ItemSelectedChange) {
diff --git a/cockatrice/src/carditem.h b/cockatrice/src/carditem.h
index d4fc765c..9dd0a785 100644
--- a/cockatrice/src/carditem.h
+++ b/cockatrice/src/carditem.h
@@ -69,7 +69,6 @@ protected:
 	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
 	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
 	QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
 };