diff --git a/main.cpp b/main.cpp
index 9376351..6a0773b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -26,7 +26,7 @@ void parseArguments(int argc, char **argv, SNES &snes)
 			{0,         0,                 0,  0 }
 		};
 
-		char c = getopt_long(argc, argv, "c:pu-debug", long_options, &option_index);
+		char c = getopt_long(argc, argv, "c", long_options, &option_index);
 		if (c == -1)
 			break;
 		switch (c) {
diff --git a/sources/Debugger/MemoryViewer.cpp b/sources/Debugger/MemoryViewer.cpp
index 2280a55..e94d950 100644
--- a/sources/Debugger/MemoryViewer.cpp
+++ b/sources/Debugger/MemoryViewer.cpp
@@ -3,6 +3,7 @@
 //
 
 #include <iostream>
+#include <cmath>
 #include "MemoryViewer.hpp"
 #include "../SNES.hpp"
 #include "../Utility/Utility.hpp"
@@ -44,8 +45,8 @@ QVariant MemoryViewerModel::headerData(int section, Qt::Orientation orientation,
 		snprintf(buf, 2, "%1X", section);
 		return QString(buf);
 	} else {
-		char buf[5];
-		snprintf(buf, 5, "%03Xx", section);
+		char buf[6];
+		snprintf(buf, 6, "%0*Xx", this->_headerIndentSize, section);
 		return QString(buf);
 	}
 }
@@ -53,6 +54,7 @@ QVariant MemoryViewerModel::headerData(int section, Qt::Orientation orientation,
 void MemoryViewerModel::setMemory(std::shared_ptr<Ram> memory)
 {
 	this->_memory = std::move(memory);
+	this->_headerIndentSize = this->_memory->getSize() >= 0x10000 ? 4 : 3;
 	emit this->layoutChanged();
 }
 
diff --git a/sources/Debugger/MemoryViewer.hpp b/sources/Debugger/MemoryViewer.hpp
index 82eac79..218dc55 100644
--- a/sources/Debugger/MemoryViewer.hpp
+++ b/sources/Debugger/MemoryViewer.hpp
@@ -18,6 +18,8 @@ Q_OBJECT
 private:
 	//! @brief The ram to watch.
 	std::shared_ptr<Ram> _memory;
+	//! @brief The number of char inside the left header number.
+	int _headerIndentSize = 3;
 public:
 	//! @brief Change the ram currently watched.
 	void setMemory(std::shared_ptr<Ram> memory);