diff --git a/data/maproombuilder.lua b/data/maproombuilder.lua
index 7343fbc..90cc197 100644
--- a/data/maproombuilder.lua
+++ b/data/maproombuilder.lua
@@ -188,6 +188,7 @@ local function add_pits_to_room(map)
 		end
 	end
 	
+	matrix = matrix[random(#matrix)]
 	for i=2,13 do
 		for j=2,10 do
 			if not tile_occupied(map, (i), (j)) and matrix[i][j] then
diff --git a/src/main.c b/src/main.c
index df37918..d2d26b2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -250,6 +250,7 @@ goToMainMenu(void *unused)
 	inGameMenu = NULL;
 	initMainMenu();
 	Position p = { 0, 0 };
+	gPlayer->sprite->pos = (Position) { 32, 32 };
 	map_set_current_room(gMap, &p);
 	camera_follow_position(gCamera, &p);
 }
diff --git a/src/skillbar.c b/src/skillbar.c
index 7c2fcc6..ea20d73 100644
--- a/src/skillbar.c
+++ b/src/skillbar.c
@@ -222,6 +222,10 @@ render_skill_sparkles(SkillBar *bar, Player *player)
 		return;
 	}
 
+	if (player->stats.lvl == 1) {
+		return;
+	}
+
 	Position pos = { 0, GAME_VIEW_HEIGHT };
 	Dimension dim = { 32, 32 };
 	for (int i = 0; i < PLAYER_SKILL_COUNT; ++i) {