diff --git a/hypervisor/bsp/uefi/efi/boot.c b/hypervisor/bsp/uefi/efi/boot.c
index a37cb98c9..b922e9452 100644
--- a/hypervisor/bsp/uefi/efi/boot.c
+++ b/hypervisor/bsp/uefi/efi/boot.c
@@ -126,7 +126,7 @@ again:
 		EFI_MEMORY_DESCRIPTOR *d;
 		uint32_t e820_type = 0;
 
-		d = (EFI_MEMORY_DESCRIPTOR *)((unsigned long)map_buf + (i * desc_size));
+		d = (EFI_MEMORY_DESCRIPTOR *)((uint64_t)map_buf + (i * desc_size));
 		switch(d->Type) {
 		case EfiReservedMemoryType:
 		case EfiRuntimeServicesCode:
diff --git a/hypervisor/common/schedule.c b/hypervisor/common/schedule.c
index baa71bab9..d00fb759a 100644
--- a/hypervisor/common/schedule.c
+++ b/hypervisor/common/schedule.c
@@ -7,7 +7,7 @@
 #include <hypervisor.h>
 #include <schedule.h>
 
-static unsigned long pcpu_used_bitmap;
+static uint64_t pcpu_used_bitmap;
 
 void init_scheduler(void)
 {
diff --git a/hypervisor/include/lib/bits.h b/hypervisor/include/lib/bits.h
index 57f88695a..d2297e9bb 100644
--- a/hypervisor/include/lib/bits.h
+++ b/hypervisor/include/lib/bits.h
@@ -105,7 +105,7 @@ static inline uint16_t fls64(uint64_t value)
  *	ffs64 (0x8000000000000001) = 0
  *	ffs64 (0xf000000000000000) = 60
  *
- * @param value: 'unsigned long' type value
+ * @param value: 'uint64_t' type value
  *
  * @return value: zero-based bit index, INVALID_BIT_INDEX means
  * when 'value' was zero, bit operations function can't find bit
diff --git a/hypervisor/lib/crypto/mbedtls/ChangeLog b/hypervisor/lib/crypto/mbedtls/ChangeLog
index 4518efa60..74583e165 100644
--- a/hypervisor/lib/crypto/mbedtls/ChangeLog
+++ b/hypervisor/lib/crypto/mbedtls/ChangeLog
@@ -2267,7 +2267,7 @@ Changes
    * Generalized external private key implementation handling (like PKCS#11)
      in SSL/TLS
    * Revamped x509_verify() and the SSL f_vrfy callback implementations
-   * Moved from unsigned long to fixed width uint32_t types throughout code
+   * Moved from uint64_t to fixed width uint32_t types throughout code
    * Renamed ciphersuites naming scheme to IANA reserved names
 
 Bugfix
diff --git a/hypervisor/lib/sprintf.c b/hypervisor/lib/sprintf.c
index 6ef121cb8..a08e0e223 100644
--- a/hypervisor/lib/sprintf.c
+++ b/hypervisor/lib/sprintf.c
@@ -252,7 +252,7 @@ static void print_pow2(struct print_param *param,
 		uint64_t v_arg, uint32_t shift)
 {
 	uint64_t v = v_arg;
-	/* max buffer required for octal representation of unsigned long long */
+	/* max buffer required for octal representation of uint64_t long */
 	char digitbuff[22];
 	/* Insert position for the next character+1 */
 	char *pos = digitbuff + sizeof(digitbuff);
@@ -305,7 +305,7 @@ static void print_pow2(struct print_param *param,
 
 static void print_decimal(struct print_param *param, int64_t value)
 {
-	/* max. required buffer for unsigned long long in decimal format */
+	/* max. required buffer for uint64_t long in decimal format */
 	char digitbuff[20];
 	/* pointer to the next character position (+1) */
 	char *pos = digitbuff + sizeof(digitbuff);