diff --git a/Drawer.cpp b/Drawer.cpp
index 94c8a73..e203ee5 100644
--- a/Drawer.cpp
+++ b/Drawer.cpp
@@ -1,6 +1,6 @@
 #include "Drawer.h"
 
-static const char* tileImageNames[] = {
+static const char* tileImageNames[TILE_IMAGES_N] = {
     // clang-format off
     "Pin1",    "Pin2",    "Pin3",    "Pin4",    "Pin5",    "Pin6",   "Pin7",    "Pin8",    "Pin9",
     "Sou1",    "Sou2",    "Sou3",    "Sou4",    "Sou5",    "Sou6",   "Sou7",    "Sou8",    "Sou9",
diff --git a/GamePanel.cpp b/GamePanel.cpp
index 1d5e84b..93cfeb0 100644
--- a/GamePanel.cpp
+++ b/GamePanel.cpp
@@ -20,13 +20,13 @@ GamePanel::GamePanel(wxFrame* parent)
     SetBackgroundStyle(wxBG_STYLE_PAINT);
 }
 
-void GamePanel::Start(const wxString& path, bool solveable,
+void GamePanel::Start(const wxString& path, bool solvable,
                       std::function<void(const wxSize& size)> setMinSize) {
     wxLogDebug(_("Started game"));
 
     controller.stopwatch = 0;
     controller.loadLayout(path);
-    controller.fill(solveable);
+    controller.fill(solvable);
 
     setMinSize(drawer.composeMinSize(controller.gridSize));
 
@@ -51,9 +51,9 @@ void GamePanel::undo() {
     Refresh();
 }
 
-void GamePanel::reshuffle(bool solveable) {
+void GamePanel::reshuffle(bool solvable) {
     controller.free_table();
-    controller.fill(solveable);
+    controller.fill(solvable);
 
     drawer.composeBoard(controller.getTable(), controller.gridSize);