Index: uspace/app/bdsh/cmds/modules/bdd/bdd.c
===================================================================
--- uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
+++ uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision ed90317444652a29e89501a128d66020aaea52b5)
@@ -73,5 +73,5 @@
 	size_t block_size;
 	int rc;
-	bn_t ba;
+	aoff64_t ba;
 	uint8_t b;
 
Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision ed90317444652a29e89501a128d66020aaea52b5)
@@ -85,5 +85,5 @@
 {
 	int fd, bytes = 0, count = 0, reads = 0;
-	off_t total = 0;
+	off64_t total = 0;
 	char *buff = NULL;
 
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision ed90317444652a29e89501a128d66020aaea52b5)
@@ -74,5 +74,5 @@
 {
 	int fd1, fd2, bytes = 0;
-	off_t total = 0;
+	off64_t total = 0;
 	int64_t copied = 0;
 	char *buff = NULL;
Index: uspace/app/mkfat/mkfat.c
===================================================================
--- uspace/app/mkfat/mkfat.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
+++ uspace/app/mkfat/mkfat.c	(revision ed90317444652a29e89501a128d66020aaea52b5)
@@ -98,5 +98,5 @@
 	size_t block_size;
 	char *endptr;
-	bn_t dev_nblocks;
+	aoff64_t dev_nblocks;
 
 	cfg.total_sectors = 0;
@@ -160,5 +160,5 @@
 		printf(NAME ": Warning, failed to obtain block device size.\n");
 	} else {
-		printf(NAME ": Block device has %" PRIuBN " blocks.\n",
+		printf(NAME ": Block device has %" PRIuOFF64 " blocks.\n",
 		    dev_nblocks);
 		cfg.total_sectors = dev_nblocks;
@@ -236,5 +236,5 @@
 static int fat_blocks_write(struct fat_params const *par, dev_handle_t handle)
 {
-	bn_t addr;
+	aoff64_t addr;
 	uint8_t *buffer;
 	int i;
Index: uspace/app/taskdump/elf_core.c
===================================================================
--- uspace/app/taskdump/elf_core.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
+++ uspace/app/taskdump/elf_core.c	(revision ed90317444652a29e89501a128d66020aaea52b5)
@@ -62,5 +62,5 @@
 #include "include/elf_core.h"
 
-static off_t align_foff_up(off_t foff, uintptr_t vaddr, size_t page_size);
+static off64_t align_foff_up(off64_t foff, uintptr_t vaddr, size_t page_size);
 static int write_all(int fd, void *data, size_t len);
 static int write_mem_area(int fd, as_area_info_t *area, int phoneid);
@@ -79,8 +79,8 @@
  *			ENOMEM on out of memory, EIO on write error.
  */
-int elf_core_save(const char *file_name, as_area_info_t *ainfo, int n, int phoneid)
+int elf_core_save(const char *file_name, as_area_info_t *ainfo, unsigned int n, int phoneid)
 {
 	elf_header_t elf_hdr;
-	off_t foff;
+	off64_t foff;
 	size_t n_ph;
 	elf_word flags;
@@ -89,5 +89,5 @@
 	int fd;
 	int rc;
-	int i;
+	unsigned int i;
 
 	n_ph = n;
@@ -184,5 +184,5 @@
 
 	for (i = 0; i < n_ph; ++i) {
-		if (lseek(fd, p_hdr[i].p_offset, SEEK_SET) == (off_t) -1) {
+		if (lseek(fd, p_hdr[i].p_offset, SEEK_SET) == (off64_t) -1) {
 			printf("Failed writing memory data.\n");
 			free(p_hdr);
@@ -202,14 +202,13 @@
 
 /** Align file offset up to be congruent with vaddr modulo page size. */
-static off_t align_foff_up(off_t foff, uintptr_t vaddr, size_t page_size)
-{
-	off_t rfo, rva;
-	off_t advance;
-
-	rva = vaddr % page_size;
-	rfo = foff % page_size;
-
-	advance = (rva >= rfo) ? rva - rfo : (page_size + rva - rfo);
-	return foff + advance;
+static off64_t align_foff_up(off64_t foff, uintptr_t vaddr, size_t page_size)
+{
+	off64_t rva = vaddr % page_size;
+	off64_t rfo = foff % page_size;
+	
+	if (rva >= rfo)
+		return (foff + (rva - rfo));
+	
+	return (foff + (page_size + (rva - rfo)));
 }
 
Index: uspace/app/taskdump/include/elf_core.h
===================================================================
--- uspace/app/taskdump/include/elf_core.h	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
+++ uspace/app/taskdump/include/elf_core.h	(revision ed90317444652a29e89501a128d66020aaea52b5)
@@ -36,5 +36,5 @@
 #define ELF_CORE_H_
 
-int elf_core_save(const char *file_name, as_area_info_t *ainfo, int n, int phoneid);
+int elf_core_save(const char *file_name, as_area_info_t *ainfo, unsigned int n, int phoneid);
 
 #endif
Index: uspace/app/taskdump/symtab.c
===================================================================
--- uspace/app/taskdump/symtab.c	(revision 36e9cd186877d97860a6d53672806bfac213cfa4)
+++ uspace/app/taskdump/symtab.c	(revision ed90317444652a29e89501a128d66020aaea52b5)
@@ -49,5 +49,5 @@
 static int section_hdr_load(int fd, const elf_header_t *ehdr, int idx,
     elf_section_header_t *shdr);
-static int chunk_load(int fd, off_t start, off_t size, void **ptr);
+static int chunk_load(int fd, off64_t start, size_t size, void **ptr);
 static int read_all(int fd, void *buf, size_t len);
 
@@ -65,5 +65,6 @@
 	elf_header_t elf_hdr;
 	elf_section_header_t sec_hdr;
-	off_t shstrt_start, shstrt_size;
+	off64_t shstrt_start;
+	size_t shstrt_size;
 	char *shstrt, *sec_name;
 	void *data;
@@ -307,5 +308,5 @@
 	rc = lseek(fd, elf_hdr->e_shoff + idx * sizeof(elf_section_header_t),
 	    SEEK_SET);
-	if (rc == (off_t) -1)
+	if (rc == (off64_t) -1)
 		return EIO;
 
@@ -328,10 +329,10 @@
  * @return		EOK on success or EIO on failure.
  */
-static int chunk_load(int fd, off_t start, off_t size, void **ptr)
+static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
 {
 	int rc;
 
 	rc = lseek(fd, start, SEEK_SET);
-	if (rc == (off_t) -1) {
+	if (rc == (off64_t) -1) {
 		printf("failed seeking chunk\n");
 		*ptr = NULL;