diff --git a/apps/AllocPages.c b/apps/AllocPages.c
index 77a082e..bb81849 100644
--- a/apps/AllocPages.c
+++ b/apps/AllocPages.c
@@ -116,7 +116,7 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
 	INTN AllocType = -1;
 	INTN MemType = -1;
 	INTN NumPages = -1;
-	UINTN Addr = 0;
+	EFI_PHYSICAL_ADDRESS Addr = 0;
 
 	InitializeLib(image, systab);
 
diff --git a/apps/FreePages.c b/apps/FreePages.c
index bbf2f52..247c75d 100644
--- a/apps/FreePages.c
+++ b/apps/FreePages.c
@@ -89,7 +89,7 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
 	INTN err = 0;
 
 	INTN PgCnt = -1;
-	UINTN PhysAddr = 0;
+	EFI_PHYSICAL_ADDRESS PhysAddr = 0;
 
 	InitializeLib(image, systab);
 
diff --git a/apps/route80h.c b/apps/route80h.c
index 8df860c..e1f62f0 100644
--- a/apps/route80h.c
+++ b/apps/route80h.c
@@ -129,7 +129,7 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *systab)
 	lpcif.rcba &= ~1UL;
 
 	Print(L"rcba: 0x%8x\n", lpcif.rcba, lpcif.rcba);
-	set_bit((uint32_t *)(uint64_t)(lpcif.rcba + GCS_OFFSET_ADDR),
+	set_bit((uint32_t *)(intptr_t)(lpcif.rcba + GCS_OFFSET_ADDR),
 		     GCS_RPR_SHIFT, GCS_RPR_PCI);
 
 	return EFI_SUCCESS;
diff --git a/inc/efilink.h b/inc/efilink.h
index b2ff4fa..cc5aa2d 100644
--- a/inc/efilink.h
+++ b/inc/efilink.h
@@ -142,7 +142,7 @@ typedef struct _LIST_ENTRY {
 //  EFI_FIELD_OFFSET - returns the byte offset to a field within a structure
 //
 
-#define EFI_FIELD_OFFSET(TYPE,Field) ((UINTN)(&(((TYPE *) 0)->Field)))
+#define EFI_FIELD_OFFSET(TYPE,Field) ((UINTN)(intptr_t)(&(((TYPE *) 0)->Field)))
 
 //
 //  CONTAINING_RECORD - returns a pointer to the structure