diff --git a/source/amx/amx.c b/source/amx/amx.c
index 675576ff..aec92386 100644
--- a/source/amx/amx.c
+++ b/source/amx/amx.c
@@ -1041,6 +1041,16 @@ int AMXAPI amx_Init(AMX *amx,void *program)
     AMX_FUNCSTUB *fs;
     int i,num;
 
+    fs=GETENTRY(hdr,publics,0);
+    assert(hdr->publics<=hdr->natives);
+    num=NUMENTRIES(hdr,publics,natives);
+    for (i=0; i<num; i++) {
+      amx_AlignCell(&fs->address);
+      if (USENAMETABLE(hdr))
+        amx_Align32(&((AMX_FUNCSTUBNT*)fs)->nameofs);
+      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
+    } /* for */
+
     fs=GETENTRY(hdr,natives,0);
     num=NUMENTRIES(hdr,natives,libraries);
     for (i=0; i<num; i++) {
@@ -1050,9 +1060,8 @@ int AMXAPI amx_Init(AMX *amx,void *program)
       fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
     } /* for */
 
-    fs=GETENTRY(hdr,publics,0);
-    assert(hdr->publics<=hdr->natives);
-    num=NUMENTRIES(hdr,publics,natives);
+    fs=GETENTRY(hdr,libraries,0);
+    num=NUMENTRIES(hdr,libraries,pubvars);
     for (i=0; i<num; i++) {
       amx_AlignCell(&fs->address);
       if (USENAMETABLE(hdr))
diff --git a/source/amx/amxdbg.c b/source/amx/amxdbg.c
index b0adcd60..a713f782 100644
--- a/source/amx/amxdbg.c
+++ b/source/amx/amxdbg.c
@@ -276,8 +276,8 @@ int AMXAPI dbg_LoadInfo(AMX_DBG *amxdbg, FILE *fp)
          && (cell)line->address > (cell)(line - 1)->address) {
     #if BYTE_ORDER==BIG_ENDIAN
       for (index = 0; index <= (uint32_t)(1u << 16) - 1; index++) {
-        dbg_AlignCell(&linetbl[index].address);
-        dbg_Align32((uint32_t*)&linetbl[index].line);
+        dbg_AlignCell(&amxdbg->linetbl[index].address);
+        dbg_Align32((uint32_t*)&amxdbg->linetbl[index].line);
         line++;
       } /* for */
     #endif