diff --git a/loader/link.x b/loader/link.x
index 90c023eee..ecb989b85 100644
--- a/loader/link.x
+++ b/loader/link.x
@@ -1,9 +1,9 @@
 MEMORY
 {
-  RAM : ORIGIN = 0x40000000, LENGTH = 16M
   FLASH : ORIGIN = 0x20501000, LENGTH = 188k
   FONTS : ORIGIN = 0x20530000, LENGTH = 4352k
-  MEMLCD: ORIGIN = 0xB0000000, LENGTH = 32k
+  RAM : ORIGIN = 0x40000000, LENGTH = 16M
+  MEMLCD : ORIGIN = 0xB0000000, LENGTH = 32k
 }
 /*
 Fonts go from 0x2053_0000 to 0x2097_0000
@@ -51,7 +51,7 @@ SECTIONS
   .text.dummy (NOLOAD) :
   {
     /* This section is intended to make _stext address work */
-    . = _stext;
+    . = ABSOLUTE(_stext);
   } > REGION_TEXT
 
   .text _stext :
@@ -91,7 +91,7 @@ SECTIONS
     _edata = .;
   } > REGION_DATA AT > REGION_RODATA
 
-  .fonts ALIGN(65536) : SUBALIGN(65536)
+  .fonts : ALIGN(65536)
   {
       KEEP(*(.fontdata));
   } > FONTS
diff --git a/tools/src/elf.rs b/tools/src/elf.rs
index b9dd01320..000749394 100644
--- a/tools/src/elf.rs
+++ b/tools/src/elf.rs
@@ -209,7 +209,7 @@ pub fn process_program(b: &[u8]) -> Result<ProgramDescription, ElfReadError> {
                 s.address()
             );
             continue;
-        } else if text_offset == 0 && s.size() != 0 {
+        } else if text_offset == 0 && (s.address() != 0 || s.size() != 0) {
             text_offset = s.address() as u32;
             text_size += s.size() as u32;
         } else {