Index: kernel/generic/src/lib/elf.c
===================================================================
--- kernel/generic/src/lib/elf.c	(revision 75dd55d7399a17f1fe7b170fd0d79e0eed7158c2)
+++ kernel/generic/src/lib/elf.c	(revision ee68e4bc4d0b10815e4ef17fd625a9a33dd1242d)
@@ -70,5 +70,5 @@
  * @return EE_OK on success
  */
-int elf_load(elf_header_t *header, as_t * as)
+unsigned int elf_load(elf_header_t *header, as_t * as)
 {
 	int i, rc;
@@ -132,5 +132,5 @@
  * @return NULL terminated description of error.
  */
-char *elf_error(int rc)
+char *elf_error(unsigned int rc)
 {
 	ASSERT(rc < sizeof(error_codes) / sizeof(char *));
Index: kernel/generic/src/lib/func.c
===================================================================
--- kernel/generic/src/lib/func.c	(revision 75dd55d7399a17f1fe7b170fd0d79e0eed7158c2)
+++ kernel/generic/src/lib/func.c	(revision ee68e4bc4d0b10815e4ef17fd625a9a33dd1242d)
@@ -140,7 +140,7 @@
 int strncmp(const char *src, const char *dst, size_t len)
 {
-	int i;
+	unsigned int i;
 	
-	for (i = 0; *src && *dst && i < len; src++, dst++, i++) {
+	for (i = 0; (*src) && (*dst) && (i < len); src++, dst++, i++) {
 		if (*src < *dst)
 			return -1;
@@ -169,5 +169,5 @@
 void strncpy(char *dest, const char *src, size_t len)
 {
-	int i;
+	unsigned int i;
 	for (i = 0; i < len; i++) {
 		if (!(dest[i] = src[i]))
Index: kernel/generic/src/lib/memstr.c
===================================================================
--- kernel/generic/src/lib/memstr.c	(revision 75dd55d7399a17f1fe7b170fd0d79e0eed7158c2)
+++ kernel/generic/src/lib/memstr.c	(revision ee68e4bc4d0b10815e4ef17fd625a9a33dd1242d)
@@ -60,5 +60,5 @@
 void *_memcpy(void * dst, const void *src, size_t cnt)
 {
-	int i, j;
+	unsigned int i, j;
 	
 	if (ALIGN_UP((uintptr_t) src, sizeof(unative_t)) != (uintptr_t) src ||
@@ -90,5 +90,5 @@
 void _memsetb(uintptr_t dst, size_t cnt, uint8_t x)
 {
-	int i;
+	unsigned int i;
 	uint8_t *p = (uint8_t *) dst;
 	
@@ -109,5 +109,5 @@
 void _memsetw(uintptr_t dst, size_t cnt, uint16_t x)
 {
-	int i;
+	unsigned int i;
 	uint16_t *p = (uint16_t *) dst;
 	
Index: kernel/generic/src/lib/sort.c
===================================================================
--- kernel/generic/src/lib/sort.c	(revision 75dd55d7399a17f1fe7b170fd0d79e0eed7158c2)
+++ kernel/generic/src/lib/sort.c	(revision ee68e4bc4d0b10815e4ef17fd625a9a33dd1242d)
@@ -97,12 +97,15 @@
 {
 	if (n > 4) {
-		int i = 0, j = n - 1;
+		unsigned int i = 0, j = n - 1;
 
 		memcpy(pivot, data, e_size);
 
 		while (1) {
-			while ((cmp(data + i * e_size, pivot) < 0) && i < n) i++;
-			while ((cmp(data + j * e_size, pivot) >=0) && j > 0) j--;
-			if (i<j) {
+			while ((cmp(data + i * e_size, pivot) < 0) && (i < n))
+				i++;
+			while ((cmp(data + j * e_size, pivot) >= 0) && (j > 0))
+				j--;
+			
+			if (i < j) {
 				memcpy(tmp, data + i * e_size, e_size);
 				memcpy(data + i * e_size, data + j * e_size, e_size);