diff --git a/src/Makefile b/src/Makefile
index 76baa8fa..efe91b3f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,8 +21,8 @@ ifeq ($(firstword $(CXX)),g++)
 USE_GNUC ?= 1
 endif
 ifeq ($(USE_GNUC),1)
-CXXFLAGS += -O2 -MMD
-##CXXFLAGS += -O0 -g -MMD
+##CXXFLAGS += -O2 -MMD
+CXXFLAGS += -O0 -g -MMD
 CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wwrite-strings -Werror
 ##CXXFLAGS += -Wshadow
 endif
diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index 0218014e..a777b156 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -405,6 +405,7 @@ PackLinuxElf32x86::buildLinuxLoader(
     addLoader("LEXEC020", NULL);
     addLoader("FOLDEXEC", NULL);
 
+    freezeLoader();
     upx_byte *ptr_cto = getLoader();
     int sz_cto = getLoaderSize();
     if (0x20==(ft->id & 0xF0) || 0x30==(ft->id & 0xF0)) {  // push byte '?'  ; cto8
@@ -414,7 +415,6 @@ PackLinuxElf32x86::buildLinuxLoader(
     // PackHeader and overlay_offset at the end of the output file,
     // after the compressed data.
 
-    freezeLoader();
     return getLoaderSize();
 }