diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp
index a6d5f024..3da0406b 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@@ -254,6 +254,7 @@ void Player::rearrangeZones()
 		table->setPos(base);
 	}
 	hand->updateOrientation();
+	table->reorganizeCards();
 	updateBoundingRect();
 	rearrangeCounters();
 }
diff --git a/cockatrice/src/tablezone.cpp b/cockatrice/src/tablezone.cpp
index bce8d299..33e88203 100644
--- a/cockatrice/src/tablezone.cpp
+++ b/cockatrice/src/tablezone.cpp
@@ -43,7 +43,7 @@ void TableZone::paint(QPainter *painter, const QStyleOptionGraphicsItem */*optio
 	else
 		painter->fillRect(boundingRect(), QBrush(bgPixmap));
 	painter->setPen(QColor(255, 255, 255, 40));
-	qreal separatorY = 3 * (CARD_HEIGHT + paddingY) - paddingY / 2;
+	qreal separatorY = 3 * (CARD_HEIGHT + paddingY) + boxLineWidth - paddingY / 2;
 	if (player->getMirrored())
 		separatorY = height - separatorY;
 	painter->drawLine(QPointF(0, separatorY), QPointF(width, separatorY));
diff --git a/common/server_game.cpp b/common/server_game.cpp
index e4ac5f89..438f4711 100644
--- a/common/server_game.cpp
+++ b/common/server_game.cpp
@@ -137,7 +137,7 @@ void Server_Game::startGameIfReady()
 		query.exec();
 	}
 */	
-	setActivePlayer(0);
+	setActivePlayer(players.keys().first());
 }
 
 void Server_Game::stopGameIfFinished()