diff --git a/containers/posix/fs0/main.c b/containers/posix/fs0/main.c
index 7fc7475..b5b672b 100644
--- a/containers/posix/fs0/main.c
+++ b/containers/posix/fs0/main.c
@@ -122,7 +122,7 @@ void handle_fs_requests(void)
 	default:
 		printf("%s: Unrecognised ipc tag (%d) "
 		       "received from tid: %d. Ignoring.\n", __TASKNAME__,
-		       mr[MR_TAG], sender);
+		       mr[MR_TAG], senderid);
 	}
 
 	/* Reply */
diff --git a/containers/posix/fs0/src/memfs/memfs.c b/containers/posix/fs0/src/memfs/memfs.c
index 95d957f..72bb764 100644
--- a/containers/posix/fs0/src/memfs/memfs.c
+++ b/containers/posix/fs0/src/memfs/memfs.c
@@ -192,7 +192,7 @@ struct superblock *memfs_get_superblock(void *block)
 		return 0;
 	}
 	if (sb->magic != MEMFS_MAGIC) {
-		printf("%s: Magic number not match: %s\n", __FUNCTION__, sb->magic);
+		printf("%s: Magic number not match: %u\n", __FUNCTION__, sb->magic);
 		return 0;
 	}
 
diff --git a/containers/posix/libc2/SConscript b/containers/posix/libc/SConscript
similarity index 100%
rename from containers/posix/libc2/SConscript
rename to containers/posix/libc/SConscript
diff --git a/containers/posix/libc2/crt/sys-baremetal/arch-arm/crt0.S b/containers/posix/libc/crt/sys-baremetal/arch-arm/crt0.S
similarity index 100%
rename from containers/posix/libc2/crt/sys-baremetal/arch-arm/crt0.S
rename to containers/posix/libc/crt/sys-baremetal/arch-arm/crt0.S
diff --git a/containers/posix/libc2/include/arch/arm/arch/inttypes.h b/containers/posix/libc/include/arch/arm/arch/inttypes.h
similarity index 100%
rename from containers/posix/libc2/include/arch/arm/arch/inttypes.h
rename to containers/posix/libc/include/arch/arm/arch/inttypes.h
diff --git a/containers/posix/libc2/include/arch/arm/arch/pl011_uart.h b/containers/posix/libc/include/arch/arm/arch/pl011_uart.h
similarity index 100%
rename from containers/posix/libc2/include/arch/arm/arch/pl011_uart.h
rename to containers/posix/libc/include/arch/arm/arch/pl011_uart.h
diff --git a/containers/posix/libc2/include/arch/arm/arch/setjmp.h b/containers/posix/libc/include/arch/arm/arch/setjmp.h
similarity index 100%
rename from containers/posix/libc2/include/arch/arm/arch/setjmp.h
rename to containers/posix/libc/include/arch/arm/arch/setjmp.h
diff --git a/containers/posix/libc2/include/arch/arm/arch/stdint.h b/containers/posix/libc/include/arch/arm/arch/stdint.h
similarity index 100%
rename from containers/posix/libc2/include/arch/arm/arch/stdint.h
rename to containers/posix/libc/include/arch/arm/arch/stdint.h
diff --git a/containers/posix/libc2/include/assert.h b/containers/posix/libc/include/assert.h
similarity index 100%
rename from containers/posix/libc2/include/assert.h
rename to containers/posix/libc/include/assert.h
diff --git a/containers/posix/libc2/include/complex.h b/containers/posix/libc/include/complex.h
similarity index 100%
rename from containers/posix/libc2/include/complex.h
rename to containers/posix/libc/include/complex.h
diff --git a/containers/posix/libc2/include/ctype.h b/containers/posix/libc/include/ctype.h
similarity index 100%
rename from containers/posix/libc2/include/ctype.h
rename to containers/posix/libc/include/ctype.h
diff --git a/containers/posix/libc2/include/errno.h b/containers/posix/libc/include/errno.h
similarity index 97%
rename from containers/posix/libc2/include/errno.h
rename to containers/posix/libc/include/errno.h
index 4b4db9a..12698e7 100644
--- a/containers/posix/libc2/include/errno.h
+++ b/containers/posix/libc/include/errno.h
@@ -88,11 +88,17 @@
 #ifndef _ERRNO_H_
 #define _ERRNO_H_
 
+#ifndef EDOM
 #define EDOM 1
+#endif
+#ifndef EILSEQ
 #define EILSEQ 2
+#endif
+#ifndef ERANGE
 #define ERANGE 3
+#endif
 
-#include <l4/thread.h>
+//#include <l4/thread.h>
  
 #ifndef THREAD_SAFE
 extern int errno;
diff --git a/containers/posix/libc2/include/inttypes.h b/containers/posix/libc/include/inttypes.h
similarity index 100%
rename from containers/posix/libc2/include/inttypes.h
rename to containers/posix/libc/include/inttypes.h
diff --git a/containers/posix/libc2/include/iso646.h b/containers/posix/libc/include/iso646.h
similarity index 100%
rename from containers/posix/libc2/include/iso646.h
rename to containers/posix/libc/include/iso646.h
diff --git a/containers/posix/libc2/include/limits.h b/containers/posix/libc/include/limits.h
similarity index 100%
rename from containers/posix/libc2/include/limits.h
rename to containers/posix/libc/include/limits.h
diff --git a/containers/posix/libc2/include/locale.h b/containers/posix/libc/include/locale.h
similarity index 100%
rename from containers/posix/libc2/include/locale.h
rename to containers/posix/libc/include/locale.h
diff --git a/containers/posix/libc2/include/setjmp.h b/containers/posix/libc/include/setjmp.h
similarity index 100%
rename from containers/posix/libc2/include/setjmp.h
rename to containers/posix/libc/include/setjmp.h
diff --git a/containers/posix/libc2/include/stdarg.h b/containers/posix/libc/include/stdarg.h
similarity index 100%
rename from containers/posix/libc2/include/stdarg.h
rename to containers/posix/libc/include/stdarg.h
diff --git a/containers/posix/libc2/include/stdbool.h b/containers/posix/libc/include/stdbool.h
similarity index 100%
rename from containers/posix/libc2/include/stdbool.h
rename to containers/posix/libc/include/stdbool.h
diff --git a/containers/posix/libc2/include/stddef.h b/containers/posix/libc/include/stddef.h
similarity index 99%
rename from containers/posix/libc2/include/stddef.h
rename to containers/posix/libc/include/stddef.h
index 99a5f12..1eaa096 100644
--- a/containers/posix/libc2/include/stddef.h
+++ b/containers/posix/libc/include/stddef.h
@@ -111,7 +111,9 @@ typedef __SIZE_TYPE__ size_t;
 		       things such as varargs and printf */
 typedef __WCHAR_TYPE__ wchar_t;
 #endif
+#ifndef NULL
 #define NULL ((void *)0)
+#endif
 #define offsetof(type, member) ((size_t) &((type *)0)->member)
 
 #endif /* _STDDEF_H_ */
diff --git a/containers/posix/libc2/include/stdint.h b/containers/posix/libc/include/stdint.h
similarity index 100%
rename from containers/posix/libc2/include/stdint.h
rename to containers/posix/libc/include/stdint.h
diff --git a/containers/posix/libc2/include/stdio.h b/containers/posix/libc/include/stdio.h
similarity index 99%
rename from containers/posix/libc2/include/stdio.h
rename to containers/posix/libc/include/stdio.h
index 374a87f..bbca2a9 100644
--- a/containers/posix/libc2/include/stdio.h
+++ b/containers/posix/libc/include/stdio.h
@@ -136,9 +136,15 @@ typedef long fpos_t; /* same */
 #define FILENAME_MAX 37
 #define L_tmpnam 37
 
+#ifndef SEEK_CUR
 #define SEEK_CUR 0
+#endif
+#ifndef SEEK_END
 #define SEEK_END 1
+#endif
+#ifndef SEEK_SET
 #define SEEK_SET 2
+#endif
 
 #define TMP_MAX 37
 
diff --git a/containers/posix/libc2/include/stdlib.h b/containers/posix/libc/include/stdlib.h
similarity index 100%
rename from containers/posix/libc2/include/stdlib.h
rename to containers/posix/libc/include/stdlib.h
diff --git a/containers/posix/libc2/include/string.h b/containers/posix/libc/include/string.h
similarity index 100%
rename from containers/posix/libc2/include/string.h
rename to containers/posix/libc/include/string.h
diff --git a/containers/posix/libc2/include/sys-baremetal/arch-arm/arch/inttypes.h b/containers/posix/libc/include/sys-baremetal/arch-arm/arch/inttypes.h
similarity index 100%
rename from containers/posix/libc2/include/sys-baremetal/arch-arm/arch/inttypes.h
rename to containers/posix/libc/include/sys-baremetal/arch-arm/arch/inttypes.h
diff --git a/containers/posix/libc2/include/sys-baremetal/arch-arm/arch/pl011_uart.h b/containers/posix/libc/include/sys-baremetal/arch-arm/arch/pl011_uart.h
similarity index 100%
rename from containers/posix/libc2/include/sys-baremetal/arch-arm/arch/pl011_uart.h
rename to containers/posix/libc/include/sys-baremetal/arch-arm/arch/pl011_uart.h
diff --git a/containers/posix/libc2/include/sys-baremetal/arch-arm/arch/setjmp.h b/containers/posix/libc/include/sys-baremetal/arch-arm/arch/setjmp.h
similarity index 100%
rename from containers/posix/libc2/include/sys-baremetal/arch-arm/arch/setjmp.h
rename to containers/posix/libc/include/sys-baremetal/arch-arm/arch/setjmp.h
diff --git a/containers/posix/libc2/include/sys-baremetal/arch-arm/arch/stdint.h b/containers/posix/libc/include/sys-baremetal/arch-arm/arch/stdint.h
similarity index 100%
rename from containers/posix/libc2/include/sys-baremetal/arch-arm/arch/stdint.h
rename to containers/posix/libc/include/sys-baremetal/arch-arm/arch/stdint.h
diff --git a/containers/posix/libc2/include/sys-baremetal/arch-arm/inttypes.h b/containers/posix/libc/include/sys-baremetal/arch-arm/inttypes.h
similarity index 100%
rename from containers/posix/libc2/include/sys-baremetal/arch-arm/inttypes.h
rename to containers/posix/libc/include/sys-baremetal/arch-arm/inttypes.h
diff --git a/containers/posix/libc2/include/sys-baremetal/arch-arm/pl011_uart.h b/containers/posix/libc/include/sys-baremetal/arch-arm/pl011_uart.h
similarity index 100%
rename from containers/posix/libc2/include/sys-baremetal/arch-arm/pl011_uart.h
rename to containers/posix/libc/include/sys-baremetal/arch-arm/pl011_uart.h
diff --git a/containers/posix/libc2/include/sys-baremetal/arch-arm/setjmp.h b/containers/posix/libc/include/sys-baremetal/arch-arm/setjmp.h
similarity index 100%
rename from containers/posix/libc2/include/sys-baremetal/arch-arm/setjmp.h
rename to containers/posix/libc/include/sys-baremetal/arch-arm/setjmp.h
diff --git a/containers/posix/libc2/include/sys-baremetal/arch-arm/stdint.h b/containers/posix/libc/include/sys-baremetal/arch-arm/stdint.h
similarity index 100%
rename from containers/posix/libc2/include/sys-baremetal/arch-arm/stdint.h
rename to containers/posix/libc/include/sys-baremetal/arch-arm/stdint.h
diff --git a/containers/posix/libc2/include/sys-userspace/arch-arm/arch/inttypes.h b/containers/posix/libc/include/sys-userspace/arch-arm/arch/inttypes.h
similarity index 100%
rename from containers/posix/libc2/include/sys-userspace/arch-arm/arch/inttypes.h
rename to containers/posix/libc/include/sys-userspace/arch-arm/arch/inttypes.h
diff --git a/containers/posix/libc2/include/sys-userspace/arch-arm/arch/pl011_uart.h b/containers/posix/libc/include/sys-userspace/arch-arm/arch/pl011_uart.h
similarity index 100%
rename from containers/posix/libc2/include/sys-userspace/arch-arm/arch/pl011_uart.h
rename to containers/posix/libc/include/sys-userspace/arch-arm/arch/pl011_uart.h
diff --git a/containers/posix/libc2/include/sys-userspace/arch-arm/arch/setjmp.h b/containers/posix/libc/include/sys-userspace/arch-arm/arch/setjmp.h
similarity index 100%
rename from containers/posix/libc2/include/sys-userspace/arch-arm/arch/setjmp.h
rename to containers/posix/libc/include/sys-userspace/arch-arm/arch/setjmp.h
diff --git a/containers/posix/libc2/include/sys-userspace/arch-arm/arch/stdint.h b/containers/posix/libc/include/sys-userspace/arch-arm/arch/stdint.h
similarity index 100%
rename from containers/posix/libc2/include/sys-userspace/arch-arm/arch/stdint.h
rename to containers/posix/libc/include/sys-userspace/arch-arm/arch/stdint.h
diff --git a/containers/posix/libc2/include/sys-userspace/arch-arm/inttypes.h b/containers/posix/libc/include/sys-userspace/arch-arm/inttypes.h
similarity index 100%
rename from containers/posix/libc2/include/sys-userspace/arch-arm/inttypes.h
rename to containers/posix/libc/include/sys-userspace/arch-arm/inttypes.h
diff --git a/containers/posix/libc2/include/sys-userspace/arch-arm/pl011_uart.h b/containers/posix/libc/include/sys-userspace/arch-arm/pl011_uart.h
similarity index 100%
rename from containers/posix/libc2/include/sys-userspace/arch-arm/pl011_uart.h
rename to containers/posix/libc/include/sys-userspace/arch-arm/pl011_uart.h
diff --git a/containers/posix/libc2/include/sys-userspace/arch-arm/setjmp.h b/containers/posix/libc/include/sys-userspace/arch-arm/setjmp.h
similarity index 100%
rename from containers/posix/libc2/include/sys-userspace/arch-arm/setjmp.h
rename to containers/posix/libc/include/sys-userspace/arch-arm/setjmp.h
diff --git a/containers/posix/libc2/include/sys-userspace/arch-arm/stdint.h b/containers/posix/libc/include/sys-userspace/arch-arm/stdint.h
similarity index 100%
rename from containers/posix/libc2/include/sys-userspace/arch-arm/stdint.h
rename to containers/posix/libc/include/sys-userspace/arch-arm/stdint.h
diff --git a/containers/posix/libc2/include/time.h b/containers/posix/libc/include/time.h
similarity index 100%
rename from containers/posix/libc2/include/time.h
rename to containers/posix/libc/include/time.h
diff --git a/containers/posix/libc2/src/arch-arm/eabi.c b/containers/posix/libc/src/arch-arm/eabi.c
similarity index 100%
rename from containers/posix/libc2/src/arch-arm/eabi.c
rename to containers/posix/libc/src/arch-arm/eabi.c
diff --git a/containers/posix/libc2/src/arch-arm/jmp.S b/containers/posix/libc/src/arch-arm/jmp.S
similarity index 100%
rename from containers/posix/libc2/src/arch-arm/jmp.S
rename to containers/posix/libc/src/arch-arm/jmp.S
diff --git a/containers/posix/libc2/src/asctime.c b/containers/posix/libc/src/asctime.c
similarity index 100%
rename from containers/posix/libc2/src/asctime.c
rename to containers/posix/libc/src/asctime.c
diff --git a/containers/posix/libc2/src/assert.c b/containers/posix/libc/src/assert.c
similarity index 100%
rename from containers/posix/libc2/src/assert.c
rename to containers/posix/libc/src/assert.c
diff --git a/containers/posix/libc2/src/calloc.c b/containers/posix/libc/src/calloc.c
similarity index 100%
rename from containers/posix/libc2/src/calloc.c
rename to containers/posix/libc/src/calloc.c
diff --git a/containers/posix/libc2/src/clearerr.c b/containers/posix/libc/src/clearerr.c
similarity index 100%
rename from containers/posix/libc2/src/clearerr.c
rename to containers/posix/libc/src/clearerr.c
diff --git a/containers/posix/libc2/src/clock.c b/containers/posix/libc/src/clock.c
similarity index 100%
rename from containers/posix/libc2/src/clock.c
rename to containers/posix/libc/src/clock.c
diff --git a/containers/posix/libc2/src/ctype.c b/containers/posix/libc/src/ctype.c
similarity index 100%
rename from containers/posix/libc2/src/ctype.c
rename to containers/posix/libc/src/ctype.c
diff --git a/containers/posix/libc2/src/difftime.c b/containers/posix/libc/src/difftime.c
similarity index 100%
rename from containers/posix/libc2/src/difftime.c
rename to containers/posix/libc/src/difftime.c
diff --git a/containers/posix/libc2/src/errno.c b/containers/posix/libc/src/errno.c
similarity index 100%
rename from containers/posix/libc2/src/errno.c
rename to containers/posix/libc/src/errno.c
diff --git a/containers/posix/libc2/src/exit.c b/containers/posix/libc/src/exit.c
similarity index 100%
rename from containers/posix/libc2/src/exit.c
rename to containers/posix/libc/src/exit.c
diff --git a/containers/posix/libc2/src/fclose.c b/containers/posix/libc/src/fclose.c
similarity index 100%
rename from containers/posix/libc2/src/fclose.c
rename to containers/posix/libc/src/fclose.c
diff --git a/containers/posix/libc2/src/feof.c b/containers/posix/libc/src/feof.c
similarity index 100%
rename from containers/posix/libc2/src/feof.c
rename to containers/posix/libc/src/feof.c
diff --git a/containers/posix/libc2/src/ferror.c b/containers/posix/libc/src/ferror.c
similarity index 100%
rename from containers/posix/libc2/src/ferror.c
rename to containers/posix/libc/src/ferror.c
diff --git a/containers/posix/libc2/src/fflush.c b/containers/posix/libc/src/fflush.c
similarity index 100%
rename from containers/posix/libc2/src/fflush.c
rename to containers/posix/libc/src/fflush.c
diff --git a/containers/posix/libc2/src/fgetc.c b/containers/posix/libc/src/fgetc.c
similarity index 100%
rename from containers/posix/libc2/src/fgetc.c
rename to containers/posix/libc/src/fgetc.c
diff --git a/containers/posix/libc2/src/fgets.c b/containers/posix/libc/src/fgets.c
similarity index 100%
rename from containers/posix/libc2/src/fgets.c
rename to containers/posix/libc/src/fgets.c
diff --git a/containers/posix/libc2/src/format.c b/containers/posix/libc/src/format.c
similarity index 100%
rename from containers/posix/libc2/src/format.c
rename to containers/posix/libc/src/format.c
diff --git a/containers/posix/libc2/src/format.h b/containers/posix/libc/src/format.h
similarity index 100%
rename from containers/posix/libc2/src/format.h
rename to containers/posix/libc/src/format.h
diff --git a/containers/posix/libc2/src/fprintf.c b/containers/posix/libc/src/fprintf.c
similarity index 100%
rename from containers/posix/libc2/src/fprintf.c
rename to containers/posix/libc/src/fprintf.c
diff --git a/containers/posix/libc2/src/fputc.c b/containers/posix/libc/src/fputc.c
similarity index 100%
rename from containers/posix/libc2/src/fputc.c
rename to containers/posix/libc/src/fputc.c
diff --git a/containers/posix/libc2/src/fputs.c b/containers/posix/libc/src/fputs.c
similarity index 100%
rename from containers/posix/libc2/src/fputs.c
rename to containers/posix/libc/src/fputs.c
diff --git a/containers/posix/libc2/src/fread.c b/containers/posix/libc/src/fread.c
similarity index 100%
rename from containers/posix/libc2/src/fread.c
rename to containers/posix/libc/src/fread.c
diff --git a/containers/posix/libc2/src/fscanf.c b/containers/posix/libc/src/fscanf.c
similarity index 100%
rename from containers/posix/libc2/src/fscanf.c
rename to containers/posix/libc/src/fscanf.c
diff --git a/containers/posix/libc2/src/fseek.c b/containers/posix/libc/src/fseek.c
similarity index 100%
rename from containers/posix/libc2/src/fseek.c
rename to containers/posix/libc/src/fseek.c
diff --git a/containers/posix/libc2/src/ftell.c b/containers/posix/libc/src/ftell.c
similarity index 100%
rename from containers/posix/libc2/src/ftell.c
rename to containers/posix/libc/src/ftell.c
diff --git a/containers/posix/libc2/src/fwrite.c b/containers/posix/libc/src/fwrite.c
similarity index 100%
rename from containers/posix/libc2/src/fwrite.c
rename to containers/posix/libc/src/fwrite.c
diff --git a/containers/posix/libc2/src/getchar.c b/containers/posix/libc/src/getchar.c
similarity index 100%
rename from containers/posix/libc2/src/getchar.c
rename to containers/posix/libc/src/getchar.c
diff --git a/containers/posix/libc2/src/getenv.c b/containers/posix/libc/src/getenv.c
similarity index 100%
rename from containers/posix/libc2/src/getenv.c
rename to containers/posix/libc/src/getenv.c
diff --git a/containers/posix/libc2/src/gmtime.c b/containers/posix/libc/src/gmtime.c
similarity index 100%
rename from containers/posix/libc2/src/gmtime.c
rename to containers/posix/libc/src/gmtime.c
diff --git a/containers/posix/libc2/src/k_r_malloc.h b/containers/posix/libc/src/k_r_malloc.h
similarity index 100%
rename from containers/posix/libc2/src/k_r_malloc.h
rename to containers/posix/libc/src/k_r_malloc.h
diff --git a/containers/posix/libc2/src/locale.c b/containers/posix/libc/src/locale.c
similarity index 100%
rename from containers/posix/libc2/src/locale.c
rename to containers/posix/libc/src/locale.c
diff --git a/containers/posix/libc2/src/localtime.c b/containers/posix/libc/src/localtime.c
similarity index 100%
rename from containers/posix/libc2/src/localtime.c
rename to containers/posix/libc/src/localtime.c
diff --git a/containers/posix/libc2/src/malloc.c b/containers/posix/libc/src/malloc.c
similarity index 100%
rename from containers/posix/libc2/src/malloc.c
rename to containers/posix/libc/src/malloc.c
diff --git a/containers/posix/libc2/src/memchr.c b/containers/posix/libc/src/memchr.c
similarity index 100%
rename from containers/posix/libc2/src/memchr.c
rename to containers/posix/libc/src/memchr.c
diff --git a/containers/posix/libc2/src/memcmp.c b/containers/posix/libc/src/memcmp.c
similarity index 100%
rename from containers/posix/libc2/src/memcmp.c
rename to containers/posix/libc/src/memcmp.c
diff --git a/containers/posix/libc2/src/memcpy.c b/containers/posix/libc/src/memcpy.c
similarity index 100%
rename from containers/posix/libc2/src/memcpy.c
rename to containers/posix/libc/src/memcpy.c
diff --git a/containers/posix/libc2/src/memmove.c b/containers/posix/libc/src/memmove.c
similarity index 100%
rename from containers/posix/libc2/src/memmove.c
rename to containers/posix/libc/src/memmove.c
diff --git a/containers/posix/libc2/src/memset.c b/containers/posix/libc/src/memset.c
similarity index 100%
rename from containers/posix/libc2/src/memset.c
rename to containers/posix/libc/src/memset.c
diff --git a/containers/posix/libc2/src/mktime.c b/containers/posix/libc/src/mktime.c
similarity index 100%
rename from containers/posix/libc2/src/mktime.c
rename to containers/posix/libc/src/mktime.c
diff --git a/containers/posix/libc2/src/perror.c b/containers/posix/libc/src/perror.c
similarity index 100%
rename from containers/posix/libc2/src/perror.c
rename to containers/posix/libc/src/perror.c
diff --git a/containers/posix/libc2/src/printf.c b/containers/posix/libc/src/printf.c
similarity index 100%
rename from containers/posix/libc2/src/printf.c
rename to containers/posix/libc/src/printf.c
diff --git a/containers/posix/libc2/src/putchar.c b/containers/posix/libc/src/putchar.c
similarity index 100%
rename from containers/posix/libc2/src/putchar.c
rename to containers/posix/libc/src/putchar.c
diff --git a/containers/posix/libc2/src/puts.c b/containers/posix/libc/src/puts.c
similarity index 100%
rename from containers/posix/libc2/src/puts.c
rename to containers/posix/libc/src/puts.c
diff --git a/containers/posix/libc2/src/qsort.c b/containers/posix/libc/src/qsort.c
similarity index 100%
rename from containers/posix/libc2/src/qsort.c
rename to containers/posix/libc/src/qsort.c
diff --git a/containers/posix/libc2/src/rand.c b/containers/posix/libc/src/rand.c
similarity index 100%
rename from containers/posix/libc2/src/rand.c
rename to containers/posix/libc/src/rand.c
diff --git a/containers/posix/libc2/src/realloc.c b/containers/posix/libc/src/realloc.c
similarity index 100%
rename from containers/posix/libc2/src/realloc.c
rename to containers/posix/libc/src/realloc.c
diff --git a/containers/posix/libc2/src/remove.c b/containers/posix/libc/src/remove.c
similarity index 100%
rename from containers/posix/libc2/src/remove.c
rename to containers/posix/libc/src/remove.c
diff --git a/containers/posix/libc2/src/rename.c b/containers/posix/libc/src/rename.c
similarity index 100%
rename from containers/posix/libc2/src/rename.c
rename to containers/posix/libc/src/rename.c
diff --git a/containers/posix/libc2/src/rewind.c b/containers/posix/libc/src/rewind.c
similarity index 100%
rename from containers/posix/libc2/src/rewind.c
rename to containers/posix/libc/src/rewind.c
diff --git a/containers/posix/libc2/src/snprintf.c b/containers/posix/libc/src/snprintf.c
similarity index 100%
rename from containers/posix/libc2/src/snprintf.c
rename to containers/posix/libc/src/snprintf.c
diff --git a/containers/posix/libc2/src/sprintf.c b/containers/posix/libc/src/sprintf.c
similarity index 100%
rename from containers/posix/libc2/src/sprintf.c
rename to containers/posix/libc/src/sprintf.c
diff --git a/containers/posix/libc2/src/srand.c b/containers/posix/libc/src/srand.c
similarity index 100%
rename from containers/posix/libc2/src/srand.c
rename to containers/posix/libc/src/srand.c
diff --git a/containers/posix/libc2/src/strcat.c b/containers/posix/libc/src/strcat.c
similarity index 100%
rename from containers/posix/libc2/src/strcat.c
rename to containers/posix/libc/src/strcat.c
diff --git a/containers/posix/libc2/src/strchr.c b/containers/posix/libc/src/strchr.c
similarity index 100%
rename from containers/posix/libc2/src/strchr.c
rename to containers/posix/libc/src/strchr.c
diff --git a/containers/posix/libc2/src/strcmp.c b/containers/posix/libc/src/strcmp.c
similarity index 100%
rename from containers/posix/libc2/src/strcmp.c
rename to containers/posix/libc/src/strcmp.c
diff --git a/containers/posix/libc2/src/strcoll.c b/containers/posix/libc/src/strcoll.c
similarity index 100%
rename from containers/posix/libc2/src/strcoll.c
rename to containers/posix/libc/src/strcoll.c
diff --git a/containers/posix/libc2/src/strcpy.c b/containers/posix/libc/src/strcpy.c
similarity index 100%
rename from containers/posix/libc2/src/strcpy.c
rename to containers/posix/libc/src/strcpy.c
diff --git a/containers/posix/libc2/src/strcspn.c b/containers/posix/libc/src/strcspn.c
similarity index 100%
rename from containers/posix/libc2/src/strcspn.c
rename to containers/posix/libc/src/strcspn.c
diff --git a/containers/posix/libc2/src/strdup.c b/containers/posix/libc/src/strdup.c
similarity index 100%
rename from containers/posix/libc2/src/strdup.c
rename to containers/posix/libc/src/strdup.c
diff --git a/containers/posix/libc2/src/strerror.c b/containers/posix/libc/src/strerror.c
similarity index 100%
rename from containers/posix/libc2/src/strerror.c
rename to containers/posix/libc/src/strerror.c
diff --git a/containers/posix/libc2/src/strftime.c b/containers/posix/libc/src/strftime.c
similarity index 100%
rename from containers/posix/libc2/src/strftime.c
rename to containers/posix/libc/src/strftime.c
diff --git a/containers/posix/libc2/src/strlen.c b/containers/posix/libc/src/strlen.c
similarity index 100%
rename from containers/posix/libc2/src/strlen.c
rename to containers/posix/libc/src/strlen.c
diff --git a/containers/posix/libc2/src/strncat.c b/containers/posix/libc/src/strncat.c
similarity index 100%
rename from containers/posix/libc2/src/strncat.c
rename to containers/posix/libc/src/strncat.c
diff --git a/containers/posix/libc2/src/strncmp.c b/containers/posix/libc/src/strncmp.c
similarity index 100%
rename from containers/posix/libc2/src/strncmp.c
rename to containers/posix/libc/src/strncmp.c
diff --git a/containers/posix/libc2/src/strncpy.c b/containers/posix/libc/src/strncpy.c
similarity index 100%
rename from containers/posix/libc2/src/strncpy.c
rename to containers/posix/libc/src/strncpy.c
diff --git a/containers/posix/libc2/src/strpbrk.c b/containers/posix/libc/src/strpbrk.c
similarity index 100%
rename from containers/posix/libc2/src/strpbrk.c
rename to containers/posix/libc/src/strpbrk.c
diff --git a/containers/posix/libc2/src/strrchr.c b/containers/posix/libc/src/strrchr.c
similarity index 100%
rename from containers/posix/libc2/src/strrchr.c
rename to containers/posix/libc/src/strrchr.c
diff --git a/containers/posix/libc2/src/strspn.c b/containers/posix/libc/src/strspn.c
similarity index 100%
rename from containers/posix/libc2/src/strspn.c
rename to containers/posix/libc/src/strspn.c
diff --git a/containers/posix/libc2/src/strstr.c b/containers/posix/libc/src/strstr.c
similarity index 100%
rename from containers/posix/libc2/src/strstr.c
rename to containers/posix/libc/src/strstr.c
diff --git a/containers/posix/libc2/src/strtod.c b/containers/posix/libc/src/strtod.c
similarity index 100%
rename from containers/posix/libc2/src/strtod.c
rename to containers/posix/libc/src/strtod.c
diff --git a/containers/posix/libc2/src/strtok.c b/containers/posix/libc/src/strtok.c
similarity index 100%
rename from containers/posix/libc2/src/strtok.c
rename to containers/posix/libc/src/strtok.c
diff --git a/containers/posix/libc2/src/strtol.c b/containers/posix/libc/src/strtol.c
similarity index 100%
rename from containers/posix/libc2/src/strtol.c
rename to containers/posix/libc/src/strtol.c
diff --git a/containers/posix/libc2/src/strtoul.c b/containers/posix/libc/src/strtoul.c
similarity index 100%
rename from containers/posix/libc2/src/strtoul.c
rename to containers/posix/libc/src/strtoul.c
diff --git a/containers/posix/libc2/src/sys-baremetal/arch-arm/plat-pb926/platform_init.c b/containers/posix/libc/src/sys-baremetal/arch-arm/plat-pb926/platform_init.c
similarity index 100%
rename from containers/posix/libc2/src/sys-baremetal/arch-arm/plat-pb926/platform_init.c
rename to containers/posix/libc/src/sys-baremetal/arch-arm/plat-pb926/platform_init.c
diff --git a/containers/posix/libc2/src/sys-baremetal/arch-arm/plat-pb926/sys_fputc.c b/containers/posix/libc/src/sys-baremetal/arch-arm/plat-pb926/sys_fputc.c
similarity index 100%
rename from containers/posix/libc2/src/sys-baremetal/arch-arm/plat-pb926/sys_fputc.c
rename to containers/posix/libc/src/sys-baremetal/arch-arm/plat-pb926/sys_fputc.c
diff --git a/containers/posix/libc2/src/sys-baremetal/arch-arm/sys_stdio.c b/containers/posix/libc/src/sys-baremetal/arch-arm/sys_stdio.c
similarity index 100%
rename from containers/posix/libc2/src/sys-baremetal/arch-arm/sys_stdio.c
rename to containers/posix/libc/src/sys-baremetal/arch-arm/sys_stdio.c
diff --git a/containers/posix/libc2/src/sys-userspace/arch-arm/plat-pb926/platform_init.c b/containers/posix/libc/src/sys-userspace/arch-arm/plat-pb926/platform_init.c
similarity index 100%
rename from containers/posix/libc2/src/sys-userspace/arch-arm/plat-pb926/platform_init.c
rename to containers/posix/libc/src/sys-userspace/arch-arm/plat-pb926/platform_init.c
diff --git a/containers/posix/libc2/src/sys-userspace/arch-arm/plat-pb926/sys_fputc.c b/containers/posix/libc/src/sys-userspace/arch-arm/plat-pb926/sys_fputc.c
similarity index 100%
rename from containers/posix/libc2/src/sys-userspace/arch-arm/plat-pb926/sys_fputc.c
rename to containers/posix/libc/src/sys-userspace/arch-arm/plat-pb926/sys_fputc.c
diff --git a/containers/posix/libc2/src/sys-userspace/arch-arm/sys_stdio.c b/containers/posix/libc/src/sys-userspace/arch-arm/sys_stdio.c
similarity index 100%
rename from containers/posix/libc2/src/sys-userspace/arch-arm/sys_stdio.c
rename to containers/posix/libc/src/sys-userspace/arch-arm/sys_stdio.c
diff --git a/containers/posix/libc2/src/system.c b/containers/posix/libc/src/system.c
similarity index 100%
rename from containers/posix/libc2/src/system.c
rename to containers/posix/libc/src/system.c
diff --git a/containers/posix/libc2/src/time.c b/containers/posix/libc/src/time.c
similarity index 100%
rename from containers/posix/libc2/src/time.c
rename to containers/posix/libc/src/time.c
diff --git a/containers/posix/libc2/src/tmpfile.c b/containers/posix/libc/src/tmpfile.c
similarity index 100%
rename from containers/posix/libc2/src/tmpfile.c
rename to containers/posix/libc/src/tmpfile.c
diff --git a/containers/posix/libc2/src/ungetc.c b/containers/posix/libc/src/ungetc.c
similarity index 100%
rename from containers/posix/libc2/src/ungetc.c
rename to containers/posix/libc/src/ungetc.c
diff --git a/containers/posix/libc2/src/vfprintf.c b/containers/posix/libc/src/vfprintf.c
similarity index 100%
rename from containers/posix/libc2/src/vfprintf.c
rename to containers/posix/libc/src/vfprintf.c
diff --git a/containers/posix/libc2/src/vprintf.c b/containers/posix/libc/src/vprintf.c
similarity index 100%
rename from containers/posix/libc2/src/vprintf.c
rename to containers/posix/libc/src/vprintf.c
diff --git a/containers/posix/libc2/src/vsnprintf.c b/containers/posix/libc/src/vsnprintf.c
similarity index 100%
rename from containers/posix/libc2/src/vsnprintf.c
rename to containers/posix/libc/src/vsnprintf.c
diff --git a/containers/posix/libposix/include/posix/bits/sched.h b/containers/posix/libposix/include/posix/bits/sched.h
index b48a0c8..a174960 100644
--- a/containers/posix/libposix/include/posix/bits/sched.h
+++ b/containers/posix/libposix/include/posix/bits/sched.h
@@ -20,9 +20,9 @@
 
 #ifndef __need_schedparam
 
-#ifndef _SCHED_H
-# error "Never include <bits/sched.h> directly; use <sched.h> instead."
-#endif
+//#ifndef _SCHED_H
+//# error "Never include <bits/sched.h> directly; use <sched.h> instead."
+//#endif
 
 
 /* Scheduling algorithms.  */
diff --git a/containers/posix/libposix/include/posix/unistd.h b/containers/posix/libposix/include/posix/unistd.h
index 7590640..94d2fd8 100644
--- a/containers/posix/libposix/include/posix/unistd.h
+++ b/containers/posix/libposix/include/posix/unistd.h
@@ -277,10 +277,16 @@ extern int faccessat (int __fd, __const char *__file, int __type, int __flag)
 
 /* Values for the WHENCE argument to lseek.  */
 #ifndef	_STDIO_H		/* <stdio.h> has the same definitions.  */
+#ifndef SEEK_SET
 # define SEEK_SET	0	/* Seek from beginning of file.  */
+#endif
+#ifndef SEEK_CUR
 # define SEEK_CUR	1	/* Seek from current position.  */
+#endif
+#ifndef SEEK_END
 # define SEEK_END	2	/* Seek from end of file.  */
 #endif
+#endif
 
 #if defined __USE_BSD && !defined L_SET
 /* Old BSD names for the same constants; just for compatibility.  */
diff --git a/containers/posix/mm0/main.c b/containers/posix/mm0/main.c
index fe32503..1e29ab9 100644
--- a/containers/posix/mm0/main.c
+++ b/containers/posix/mm0/main.c
@@ -170,7 +170,7 @@ void handle_requests(void)
 		printf("%s: Unrecognised ipc tag (%d) "
 		       "received from (%d). Full mr reading: "
 		       "%u, %u, %u, %u, %u, %u. Ignoring.\n",
-		       __TASKNAME__, tag, sender, read_mr(0),
+		       __TASKNAME__, tag, senderid, read_mr(0),
 		       read_mr(1), read_mr(2), read_mr(3), read_mr(4),
 		       read_mr(5));
 	}
diff --git a/containers/posix/mm0/src/file.c b/containers/posix/mm0/src/file.c
index 0b8f0d5..5e5b91d 100644
--- a/containers/posix/mm0/src/file.c
+++ b/containers/posix/mm0/src/file.c
@@ -348,7 +348,7 @@ int read_file_pages(struct vm_file *vmfile, unsigned long pfn_start,
 							 f_offset);
 		if (IS_ERR(page)) {
 			printf("%s: %s:Could not read page %d "
-			       "from file with vnum: 0x%x\n", __TASKNAME__,
+			       "from file with vnum: 0x%lu\n", __TASKNAME__,
 			       __FUNCTION__, f_offset, vm_file_to_vnum(vmfile));
 			return (int)page;
 		}
@@ -460,7 +460,7 @@ int write_file_pages(struct vm_file *f, unsigned long pfn_start,
 		err = f->vm_obj.pager->ops.page_out(&f->vm_obj, f_offset);
 		if (err < 0) {
 			printf("%s: %s:Could not write page %d "
-			       "to file with vnum: 0x%x\n", __TASKNAME__,
+			       "to file with vnum: 0x%lu\n", __TASKNAME__,
 			       __FUNCTION__, f_offset, vm_file_to_vnum(f));
 			return err;
 		}
diff --git a/containers/posix/mm0/src/mmap.c b/containers/posix/mm0/src/mmap.c
index 5acb0e4..857385c 100644
--- a/containers/posix/mm0/src/mmap.c
+++ b/containers/posix/mm0/src/mmap.c
@@ -239,8 +239,8 @@ void *do_mmap(struct vm_file *mapfile, unsigned long file_offset,
 	/* Get total file pages, check if mapping is within file size */
 	file_npages = __pfn(page_align_up(mapfile->length));
 	if (npages > file_npages - file_offset) {
-		printf("%s: Trying to map %d pages from page %d, "
-		       "but file length is %d\n", __FUNCTION__,
+		printf("%s: Trying to map %d pages from page %lu, "
+		       "but file length is %lu\n", __FUNCTION__,
 		       npages, file_offset, file_npages);
 		return PTR_ERR(-EINVAL);
 	}
diff --git a/containers/posix/mm0/src/pagers.c b/containers/posix/mm0/src/pagers.c
index ed3512f..fd46d59 100644
--- a/containers/posix/mm0/src/pagers.c
+++ b/containers/posix/mm0/src/pagers.c
@@ -71,8 +71,8 @@ int file_page_out(struct vm_object *vm_obj, unsigned long page_offset)
 
 	/* Check first if the file has such a page at all */
 	if (__pfn(page_align_up(f->length) <= page_offset)) {
-		printf("%s: %s: Trying to look up page %d, but file length "
-		       "is %d bytes.\n", __TASKNAME__, __FUNCTION__,
+		printf("%s: %s: Trying to look up page %lu, but file length "
+		       "is %lu bytes.\n", __TASKNAME__, __FUNCTION__,
 		       page_offset, f->length);
 		BUG();
 	}
@@ -123,8 +123,8 @@ struct page *file_page_in(struct vm_object *vm_obj, unsigned long page_offset)
 
 	/* Check first if the file has such a page at all */
 	if (__pfn(page_align_up(f->length) <= page_offset)) {
-		printf("%s: %s: Trying to look up page %d, but file length "
-		       "is %d bytes.\n", __TASKNAME__, __FUNCTION__,
+		printf("%s: %s: Trying to look up page %lu, but file length "
+		       "is %lu bytes.\n", __TASKNAME__, __FUNCTION__,
 		       page_offset, f->length);
 		BUG();
 	}
@@ -253,8 +253,8 @@ struct page *bootfile_page_in(struct vm_object *vm_obj,
 
 	/* Check first if the file has such a page at all */
 	if (__pfn(page_align_up(boot_file->length) <= offset)) {
-		printf("%s: %s: Trying to look up page %d, but file length "
-		       "is %d bytes.\n", __TASKNAME__, __FUNCTION__,
+		printf("%s: %s: Trying to look up page %lu, but file length "
+		       "is %lu bytes.\n", __TASKNAME__, __FUNCTION__,
 		       offset, boot_file->length);
 		BUG();
 	}
diff --git a/containers/posix/mm0/src/utcb.c b/containers/posix/mm0/src/utcb.c
index 6add67c..3e7c814 100644
--- a/containers/posix/mm0/src/utcb.c
+++ b/containers/posix/mm0/src/utcb.c
@@ -140,7 +140,7 @@ out:
 		if (IS_ERR(err = do_mmap(0, 0, task, slot,
 					 VMA_ANONYMOUS | VMA_PRIVATE |
 					 VMA_FIXED | VM_READ | VM_WRITE, 1))) {
-			printf("UTCB: mmapping failed with %d\n", err);
+			printf("UTCB: mmapping failed with %d\n", (int)err);
 			return (int)err;
 		}
 	}
diff --git a/containers/posix/test0/src/clonetest.c b/containers/posix/test0/src/clonetest.c
index a0f50d2..093b7e4 100644
--- a/containers/posix/test0/src/clonetest.c
+++ b/containers/posix/test0/src/clonetest.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <sched.h>
+#include <bits/sched.h>
 #include <errno.h>
 #include <tests.h>
 
diff --git a/containers/posix/test0/src/dirtest.c b/containers/posix/test0/src/dirtest.c
index a091248..5eb8130 100644
--- a/containers/posix/test0/src/dirtest.c
+++ b/containers/posix/test0/src/dirtest.c
@@ -16,7 +16,7 @@
 
 void print_fsize(struct stat *s)
 {
-	printf("%d", s->st_size);
+	printf("%lu", s->st_size);
 }
 
 void print_flink(struct stat *s)
diff --git a/containers/posix/test0/src/exectest.c b/containers/posix/test0/src/exectest.c
index 9b9d945..5fba722 100644
--- a/containers/posix/test0/src/exectest.c
+++ b/containers/posix/test0/src/exectest.c
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include <errno.h>
+#include <posix/errno.h>
 
 extern char _start_test_exec[];
 extern char _end_test_exec[];
diff --git a/containers/posix/test0/src/test_exec/test_exec.c b/containers/posix/test0/src/test_exec/test_exec.c
index b1287b7..5e40cb5 100644
--- a/containers/posix/test0/src/test_exec/test_exec.c
+++ b/containers/posix/test0/src/test_exec/test_exec.c
@@ -26,7 +26,7 @@ void main(void)
 {
 	wait_pager(0);
 	if (getpid() == 2) {
-		printf("EXECVE TEST         -- PASSED --\n", getpid());
+		printf("EXECVE TEST         -- PASSED --\n");
 		printf("\nThread (%d): Continues to sync with the pager...\n\n", getpid());
 		while (1)
 			wait_pager(0);